From 74c3e97ec9f632a1136fc21b23663927b29a9661 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 4 Dec 2023 03:13:10 +0100 Subject: [PATCH] sorted imports again? --- lib/config/app_config.dart | 3 --- lib/config/firebase_options.dart | 1 - lib/config/routes.dart | 4 ---- lib/config/themes.dart | 2 -- lib/main.dart | 3 --- lib/pages/add_story/add_story.dart | 4 ---- lib/pages/add_story/add_story_view.dart | 3 --- lib/pages/add_story/invite_story_page.dart | 3 --- lib/pages/archive/archive.dart | 3 --- lib/pages/archive/archive_view.dart | 3 --- lib/pages/bootstrap/bootstrap_dialog.dart | 3 --- lib/pages/chat/add_widget_tile.dart | 3 --- lib/pages/chat/add_widget_tile_view.dart | 3 --- lib/pages/chat/chat.dart | 4 ---- lib/pages/chat/chat_app_bar_title.dart | 3 --- lib/pages/chat/chat_emoji_picker.dart | 3 --- lib/pages/chat/chat_event_list.dart | 11 ++++++----- lib/pages/chat/chat_input_row.dart | 3 --- lib/pages/chat/chat_view.dart | 14 +++++++------- lib/pages/chat/command_hints.dart | 1 - .../chat/cupertino_widgets_bottom_sheet.dart | 3 --- lib/pages/chat/edit_widgets_dialog.dart | 3 --- lib/pages/chat/encryption_button.dart | 3 --- lib/pages/chat/event_info_dialog.dart | 4 ---- lib/pages/chat/events/audio_player.dart | 4 ---- lib/pages/chat/events/cute_events.dart | 4 ---- lib/pages/chat/events/html_message.dart | 3 --- lib/pages/chat/events/image_bubble.dart | 3 --- lib/pages/chat/events/map_bubble.dart | 2 -- lib/pages/chat/events/message.dart | 3 --- lib/pages/chat/events/message_content.dart | 3 --- .../chat/events/message_download_content.dart | 3 --- lib/pages/chat/events/message_reactions.dart | 3 --- lib/pages/chat/events/reply_content.dart | 3 --- lib/pages/chat/events/state_message.dart | 3 --- lib/pages/chat/events/sticker.dart | 3 --- .../events/verification_request_content.dart | 3 --- lib/pages/chat/events/video_player.dart | 4 ---- lib/pages/chat/input_bar.dart | 3 --- lib/pages/chat/pinned_events.dart | 4 ---- lib/pages/chat/reactions_picker.dart | 3 --- lib/pages/chat/recording_dialog.dart | 4 ---- lib/pages/chat/reply_display.dart | 3 --- lib/pages/chat/seen_by_row.dart | 2 -- lib/pages/chat/send_file_dialog.dart | 3 --- lib/pages/chat/send_location_dialog.dart | 4 ---- lib/pages/chat/sticker_picker_dialog.dart | 3 --- lib/pages/chat/tombstone_display.dart | 3 --- lib/pages/chat/typing_indicators.dart | 2 -- lib/pages/chat/widgets_bottom_sheet.dart | 3 --- lib/pages/chat_details/chat_details.dart | 3 --- lib/pages/chat_details/chat_details_view.dart | 3 --- .../chat_details/participant_list_item.dart | 3 --- .../chat_encryption_settings.dart | 3 --- .../chat_encryption_settings_view.dart | 3 --- lib/pages/chat_list/chat_list.dart | 4 ---- lib/pages/chat_list/chat_list_body.dart | 3 --- lib/pages/chat_list/chat_list_header.dart | 3 --- lib/pages/chat_list/chat_list_item.dart | 3 --- lib/pages/chat_list/chat_list_view.dart | 3 --- lib/pages/chat_list/client_chooser_button.dart | 4 ---- lib/pages/chat_list/navi_rail_item.dart | 2 -- lib/pages/chat_list/search_title.dart | 1 - lib/pages/chat_list/space_view.dart | 4 ---- lib/pages/chat_list/start_chat_fab.dart | 4 ---- lib/pages/chat_list/stories_header.dart | 3 --- lib/pages/chat_members/chat_members.dart | 3 --- lib/pages/chat_members/chat_members_view.dart | 3 --- .../chat_permissions_settings.dart | 4 ---- .../chat_permissions_settings_view.dart | 3 --- .../permission_list_tile.dart | 2 -- lib/pages/device_settings/device_settings.dart | 3 --- .../device_settings/device_settings_view.dart | 3 --- .../device_settings/user_device_list_item.dart | 3 --- lib/pages/dialer/dialer.dart | 4 ---- lib/pages/dialer/pip/dismiss_keyboard.dart | 1 - lib/pages/dialer/pip/pip_view.dart | 2 -- .../homeserver_picker/homeserver_app_bar.dart | 3 --- .../homeserver_bottom_sheet.dart | 2 -- .../homeserver_picker/homeserver_picker.dart | 4 ---- .../homeserver_picker_view.dart | 10 +++++----- lib/pages/image_viewer/image_viewer.dart | 3 --- lib/pages/image_viewer/image_viewer_view.dart | 3 --- .../invitation_selection.dart | 4 ---- .../invitation_selection_view.dart | 3 --- .../key_verification_dialog.dart | 4 ---- lib/pages/login/login.dart | 4 ---- lib/pages/login/login_view.dart | 8 ++++---- lib/pages/new_group/new_group.dart | 4 ---- lib/pages/new_group/new_group_view.dart | 3 --- lib/pages/new_private_chat/new_private_chat.dart | 4 ---- .../new_private_chat/new_private_chat_view.dart | 4 ---- lib/pages/new_private_chat/qr_scanner_modal.dart | 3 --- lib/pages/new_space/new_space.dart | 4 ---- lib/pages/new_space/new_space_view.dart | 3 --- lib/pages/settings/settings.dart | 4 ---- lib/pages/settings/settings_view.dart | 3 --- lib/pages/settings_3pid/settings_3pid.dart | 3 --- lib/pages/settings_3pid/settings_3pid_view.dart | 3 --- lib/pages/settings_chat/settings_chat.dart | 2 -- lib/pages/settings_chat/settings_chat_view.dart | 3 --- .../settings_emotes/import_archive_dialog.dart | 4 ---- lib/pages/settings_emotes/settings_emotes.dart | 4 ---- .../settings_emotes/settings_emotes_view.dart | 3 --- .../settings_ignore_list.dart | 3 --- .../settings_ignore_list_view.dart | 3 --- .../settings_multiple_emotes.dart | 3 --- .../settings_multiple_emotes_view.dart | 3 --- .../settings_notifications.dart | 3 --- .../settings_notifications_view.dart | 3 --- .../settings_security/settings_security.dart | 4 ---- .../settings_security_view.dart | 3 --- lib/pages/settings_stories/settings_stories.dart | 3 --- .../settings_stories/settings_stories_view.dart | 3 --- lib/pages/settings_style/settings_style.dart | 3 --- .../settings_style/settings_style_view.dart | 3 --- lib/pages/story/story_page.dart | 4 ---- lib/pages/story/story_view.dart | 3 --- lib/pages/tasks/model/matrix_todo_list.dart | 1 - lib/pages/tasks/tasks.dart | 3 --- lib/pages/tasks/tasks_view.dart | 3 --- .../user_bottom_sheet/user_bottom_sheet.dart | 3 --- .../user_bottom_sheet_view.dart | 3 --- .../controllers/alternative_translator.dart | 4 ---- .../controllers/analytics_sender.dart | 1 - .../choreographer/controllers/choreographer.dart | 4 ---- .../choreographer/controllers/error_service.dart | 2 -- .../controllers/igc_controller.dart | 4 ---- .../choreographer/controllers/it_controller.dart | 4 ---- .../controllers/message_options.dart | 2 -- .../choreographer/widgets/choice_array.dart | 4 ---- lib/pangea/choreographer/widgets/counters.dart | 3 --- .../choreographer/widgets/has_error_button.dart | 2 -- lib/pangea/choreographer/widgets/it_bar.dart | 3 --- .../choreographer/widgets/it_bar_buttons.dart | 2 -- lib/pangea/choreographer/widgets/it_shimmer.dart | 3 --- .../widgets/language_display_toggle.dart | 3 --- .../language_permissions_warning_buttons.dart | 4 ---- .../choreographer/widgets/send_button.dart | 3 --- .../widgets/translation_finished_flow.dart | 2 -- lib/pangea/config/colors.dart | 1 - lib/pangea/config/environment.dart | 3 --- lib/pangea/constants/choreo_constants.dart | 1 - lib/pangea/constants/class_default_values.dart | 1 - lib/pangea/constants/colors.dart | 1 - lib/pangea/controllers/base_controller.dart | 1 - lib/pangea/controllers/class_controller.dart | 4 ---- .../contextual_definition_controller.dart | 4 ---- lib/pangea/controllers/language_controller.dart | 4 ---- .../controllers/language_list_controller.dart | 3 --- lib/pangea/controllers/local_settings.dart | 1 - .../message_analytics_controller.dart | 4 ---- .../controllers/message_data_controller.dart | 4 ---- .../controllers/my_analytics_controller.dart | 4 ---- lib/pangea/controllers/pangea_controller.dart | 4 ---- .../controllers/permissions_controller.dart | 2 -- .../controllers/space_rules_edit_controller.dart | 2 -- .../controllers/subscription_controller.dart | 4 ---- lib/pangea/controllers/user_controller.dart | 9 +++------ lib/pangea/controllers/word_net_controller.dart | 2 -- lib/pangea/enum/bar_chart_view_enum.dart | 2 -- lib/pangea/enum/span_choice_type.dart | 2 -- lib/pangea/enum/span_data_type.dart | 2 -- lib/pangea/enum/time_span.dart | 3 --- lib/pangea/enum/use_type.dart | 3 --- lib/pangea/enum/vocab_proficiency_enum.dart | 2 -- lib/pangea/extensions/client_extension.dart | 4 ---- .../extensions/pangea_event_extension.dart | 4 ---- lib/pangea/extensions/pangea_room_extension.dart | 4 ---- lib/pangea/guard/p_vguard.dart | 4 ---- lib/pangea/models/base_subscription_info.dart | 1 - lib/pangea/models/chart_analytics_model.dart | 3 --- lib/pangea/models/chat_topic_model.dart | 1 - lib/pangea/models/choreo_record.dart | 2 -- lib/pangea/models/class_analytics_model.dart | 1 - lib/pangea/models/class_model.dart | 4 ---- lib/pangea/models/construct_analytics_event.dart | 2 -- .../models/constructs_analytics_model.dart | 3 --- .../models/custom_input_translation_model.dart | 1 - lib/pangea/models/exchange_model.dart | 3 --- lib/pangea/models/headwords.dart | 3 --- lib/pangea/models/igc_text_data_model.dart | 4 ---- lib/pangea/models/it_response_model.dart | 3 --- lib/pangea/models/it_step.dart | 2 -- lib/pangea/models/language_model.dart | 4 ---- lib/pangea/models/message_data_models.dart | 3 --- lib/pangea/models/mobile_subscriptions.dart | 4 ---- lib/pangea/models/pangea_choreo_event.dart | 3 --- lib/pangea/models/pangea_match_model.dart | 3 --- lib/pangea/models/pangea_message_event.dart | 3 --- .../models/pangea_representation_event.dart | 4 ---- lib/pangea/models/pangea_token_model.dart | 4 ---- lib/pangea/models/pangea_tokens_event.dart | 2 -- lib/pangea/models/removed_translation.dart | 1 - lib/pangea/models/span_card_model.dart | 1 - lib/pangea/models/span_data.dart | 3 --- lib/pangea/models/student_analytics_event.dart | 4 ---- .../models/student_analytics_summary_model.dart | 3 --- .../models/system_choice_translation_model.dart | 1 - lib/pangea/models/textChangeModel.dart | 1 - lib/pangea/models/user_model.dart | 4 ---- lib/pangea/models/user_profile_search_model.dart | 2 -- lib/pangea/models/web_subscriptions.dart | 2 -- lib/pangea/models/widget_measurement.dart | 1 - lib/pangea/models/word_data_model.dart | 3 --- lib/pangea/network/p_api_exception.dart | 3 --- lib/pangea/network/requests.dart | 3 --- lib/pangea/network/urls.dart | 1 - .../pages/analytics/analytics_list_tile.dart | 3 --- lib/pangea/pages/analytics/bar_chart_card.dart | 2 -- .../analytics/bar_chart_placeholder_data.dart | 3 --- .../pages/analytics/base_analytics_page.dart | 4 ---- .../analytics/chart_view_picker_button.dart | 3 --- .../class_analytics/class_analytics.dart | 4 ---- .../class_analytics/class_analytics_view.dart | 3 --- .../pages/analytics/class_list/class_list.dart | 4 ---- .../analytics/class_list/class_list_view.dart | 3 --- lib/pangea/pages/analytics/construct_cloud.dart | 2 -- lib/pangea/pages/analytics/construct_list.dart | 4 ---- .../pages/analytics/list_summary_analytics.dart | 4 ---- .../pages/analytics/messages_bar_chart.dart | 4 ---- .../pages/analytics/messages_legend_widget.dart | 2 -- .../student_analytics/student_analytics.dart | 4 ---- .../student_analytics_view.dart | 3 --- .../pages/analytics/time_span_menu_button.dart | 3 --- lib/pangea/pages/analytics/vocab_bar_chart.dart | 3 --- .../pages/analytics/vocab_legend_widget.dart | 2 -- .../pages/class_analytics/measure_able.dart | 1 - .../class_invitation_selection.dart | 4 ---- .../pages/class_settings/class_name_header.dart | 3 --- .../class_settings/class_settings_page.dart | 4 ---- .../class_settings/class_settings_view.dart | 3 --- .../p_class_widgets/class_analytics_button.dart | 2 -- .../class_description_button.dart | 3 --- .../class_details_toggle_add_students_tile.dart | 3 --- .../class_invitation_buttons.dart | 3 --- .../p_class_widgets/class_name_button.dart | 3 --- .../p_class_widgets/class_settings_button.dart | 2 -- .../p_class_widgets/class_show_edit_dialog.dart | 2 -- .../p_class_widgets/delete_class_tile.dart | 3 --- .../p_class_widgets/room_rules_editor.dart | 3 --- lib/pangea/pages/connect/p_sso_button.dart | 3 --- .../pages/exchange/add_exchange_to_class.dart | 3 --- lib/pangea/pages/find_partner/find_partner.dart | 3 --- .../pages/find_partner/find_partner_view.dart | 3 --- lib/pangea/pages/new_class/new_class.dart | 4 ---- lib/pangea/pages/new_class/new_class_view.dart | 3 --- lib/pangea/pages/p_user_age/p_user_age.dart | 4 ---- lib/pangea/pages/p_user_age/p_user_age_view.dart | 3 --- .../settings_learning/settings_learning.dart | 3 --- .../settings_learning_view.dart | 3 --- .../change_subscription.dart | 3 --- .../settings_subscription.dart | 4 ---- .../settings_subscription_view.dart | 3 --- lib/pangea/pages/sign_up/signup.dart | 3 --- lib/pangea/pages/sign_up/signup_view.dart | 8 ++++---- lib/pangea/repo/class_repo.dart | 4 ---- .../repo/contextualized_translation_repo.dart | 3 --- lib/pangea/repo/exchange_repo.dart | 1 - lib/pangea/repo/full_text_translation_repo.dart | 3 --- lib/pangea/repo/igc_repo.dart | 3 --- .../repo/interactive_translation_repo.dart | 3 --- lib/pangea/repo/language_repo.dart | 4 ---- lib/pangea/repo/message_service.repo.dart | 1 - lib/pangea/repo/similarity_repo.dart | 3 --- lib/pangea/repo/span_data_repo.dart | 3 --- lib/pangea/repo/subscription_repo.dart | 4 ---- lib/pangea/repo/tokens_repo.dart | 3 --- lib/pangea/repo/topic_data_repo.dart | 4 ---- lib/pangea/repo/user_repo.dart | 3 --- lib/pangea/repo/word_repo.dart | 3 --- lib/pangea/utils/add_to_space.dart | 3 --- lib/pangea/utils/any_state_holder.dart | 4 ---- lib/pangea/utils/archive_space.dart | 2 -- lib/pangea/utils/bot_name.dart | 1 - lib/pangea/utils/bot_style.dart | 2 -- lib/pangea/utils/chat_list_handle_space_tap.dart | 3 --- lib/pangea/utils/class_chat_power_levels.dart | 3 --- lib/pangea/utils/class_code.dart | 4 ---- lib/pangea/utils/delete_room.dart | 2 -- lib/pangea/utils/download_chat.dart | 4 ---- lib/pangea/utils/error_handler.dart | 4 ---- .../utils/find_conversation_partner_dialog.dart | 3 --- lib/pangea/utils/firebase_analytics.dart | 3 --- .../utils/get_chat_list_item_subtitle.dart | 3 --- lib/pangea/utils/instructions.dart | 4 +--- lib/pangea/utils/join_all_space_chats.dart | 3 --- lib/pangea/utils/language_level_copy.dart | 2 -- lib/pangea/utils/lock_room.dart | 2 -- lib/pangea/utils/logout.dart | 3 --- lib/pangea/utils/martix.utils.dart | 1 - lib/pangea/utils/match_copy.dart | 4 ---- lib/pangea/utils/overlay.dart | 3 --- lib/pangea/utils/p_store.dart | 2 -- lib/pangea/utils/password_forgotten.dart | 3 --- lib/pangea/utils/platform_name.dart | 2 -- lib/pangea/utils/report_message.dart | 3 --- lib/pangea/utils/set_class_name.dart | 3 --- lib/pangea/utils/set_class_topic.dart | 2 -- lib/pangea/utils/shared_prefs.dart | 2 -- lib/pangea/utils/space_navigator.dart | 2 -- lib/pangea/utils/subscription_app_id.dart | 2 -- lib/pangea/utils/sync_status_util.dart | 4 ---- lib/pangea/utils/sync_status_util_v2.dart | 3 --- lib/pangea/widgets/chat/locked_chat_message.dart | 3 --- .../widgets/chat_list/chat_list_body_text.dart | 3 --- .../widgets/class/add_class_and_invite.dart | 4 ---- lib/pangea/widgets/class/add_space_toggles.dart | 4 ---- lib/pangea/widgets/class/join_with_link.dart | 3 --- lib/pangea/widgets/common/aligned_dialog.dart | 1 - lib/pangea/widgets/common/bot_face_svg.dart | 1 - lib/pangea/widgets/common/list_placeholder.dart | 1 - lib/pangea/widgets/common/p_circular_loader.dart | 1 - lib/pangea/widgets/common/pangea_logo_svg.dart | 2 -- lib/pangea/widgets/common/star_rating.dart | 1 - .../widgets/common_widgets/edit_list_tile.dart | 2 -- .../common_widgets/overlay_container.dart | 1 - .../widgets/common_widgets/p_input_field.dart | 2 -- lib/pangea/widgets/flag.dart | 2 -- lib/pangea/widgets/igc/card_error_widget.dart | 2 -- lib/pangea/widgets/igc/card_header.dart | 2 -- lib/pangea/widgets/igc/pangea_rich_text.dart | 4 ---- .../widgets/igc/pangea_text_controller.dart | 3 --- lib/pangea/widgets/igc/span_card.dart | 4 ---- lib/pangea/widgets/igc/span_data.dart | 2 -- lib/pangea/widgets/igc/word_data_card.dart | 4 ---- lib/pangea/widgets/login/home_picker_logo.dart | 3 --- lib/pangea/widgets/new_group/topics_list.dart | 3 --- lib/pangea/widgets/new_group/vocab_list.dart | 3 --- lib/pangea/widgets/signup/signup_buttons.dart | 16 +++++++--------- lib/pangea/widgets/signup/tos_checkbox.dart | 9 +++++---- lib/pangea/widgets/space/class_settings.dart | 4 ---- .../subscription/subscription_buttons.dart | 3 --- .../subscription/subscription_options.dart | 3 --- .../subscription/subscription_paywall.dart | 3 --- .../user_settings/country_picker_tile.dart | 4 ---- .../widgets/user_settings/language_tile.dart | 3 --- .../widgets/user_settings/p_language_dialog.dart | 4 ---- .../user_settings/p_language_dropdown.dart | 4 ++-- .../user_settings/p_question_container.dart | 1 - .../p_settings_switch_list_tile.dart | 2 -- lib/pangea/word_cloud/word_cloud_setting.dart | 3 --- lib/pangea/word_cloud/word_cloud_tap_view.dart | 2 -- lib/pangea/word_cloud/word_cloud_view.dart | 2 -- lib/utils/account_bundles.dart | 1 - lib/utils/adaptive_bottom_sheet.dart | 2 -- lib/utils/background_push.dart | 4 ---- lib/utils/client_manager.dart | 3 --- lib/utils/custom_http_client.dart | 3 --- lib/utils/custom_image_resizer.dart | 2 -- lib/utils/custom_scroll_behaviour.dart | 1 - lib/utils/date_time_extension.dart | 2 -- lib/utils/error_reporter.dart | 4 ---- lib/utils/fluffy_share.dart | 3 --- lib/utils/localized_exception_extension.dart | 4 ---- .../client_stories_extension.dart | 3 --- .../matrix_sdk_extensions/device_extension.dart | 2 -- .../matrix_sdk_extensions/event_extension.dart | 4 ---- .../filtered_timeline_extension.dart | 2 -- .../flutter_hive_collections_database.dart | 3 --- .../ios_badge_client_extension.dart | 2 -- .../matrix_file_extension.dart | 4 ---- .../matrix_sdk_extensions/matrix_locals.dart | 1 - .../presence_extension.dart | 3 --- lib/utils/platform_infos.dart | 4 ---- lib/utils/push_helper.dart | 4 ---- lib/utils/resize_image.dart | 3 --- lib/utils/room_status_extension.dart | 3 --- lib/utils/story_theme_data.dart | 2 -- lib/utils/stream_extension.dart | 1 - lib/utils/string_color.dart | 1 - lib/utils/uia_request_manager.dart | 3 --- lib/utils/update_checker_no_store.dart | 4 ---- lib/utils/url_launcher.dart | 3 --- lib/utils/voip/callkeep_manager.dart | 4 ---- lib/utils/voip/user_media_manager.dart | 3 --- lib/utils/voip_plugin.dart | 4 ---- lib/widgets/adaptive_flat_button.dart | 2 -- lib/widgets/app_lock.dart | 3 --- lib/widgets/avatar.dart | 3 --- lib/widgets/chat_settings_popup_menu.dart | 4 ---- lib/widgets/connection_status_header.dart | 4 ---- lib/widgets/content_banner.dart | 3 --- lib/widgets/error_widget.dart | 2 -- lib/widgets/fluffy_chat_app.dart | 3 --- lib/widgets/hover_builder.dart | 1 - lib/widgets/layouts/empty_page.dart | 3 --- lib/widgets/layouts/login_scaffold.dart | 3 --- lib/widgets/layouts/max_width_body.dart | 3 --- lib/widgets/layouts/two_column_layout.dart | 1 - lib/widgets/local_notifications_extension.dart | 4 ---- lib/widgets/lock_screen.dart | 4 ---- lib/widgets/log_view.dart | 2 -- lib/widgets/matrix.dart | 4 ---- lib/widgets/mxc_image.dart | 4 ---- lib/widgets/permission_slider_dialog.dart | 2 -- lib/widgets/presence_builder.dart | 3 --- lib/widgets/profile_bottom_sheet.dart | 3 --- lib/widgets/public_room_bottom_sheet.dart | 3 --- lib/widgets/settings_switch_list_tile.dart | 2 -- lib/widgets/theme_builder.dart | 2 -- lib/widgets/unread_rooms_badge.dart | 3 --- test/archive_test.dart | 1 - test/command_hint_test.dart | 3 --- test/homeserver_picker_test.dart | 1 - test/utils/test_client.dart | 2 -- test/widget_test.dart | 1 - test_driver/integration_test.dart | 1 - 408 files changed, 44 insertions(+), 1185 deletions(-) diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart index 6b10cd43f1..b3c85c1166 100644 --- a/lib/config/app_config.dart +++ b/lib/config/app_config.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:ui'; -// Package imports: import 'package:matrix/matrix.dart'; -// Project imports: import 'package:fluffychat/pangea/config/environment.dart'; abstract class AppConfig { diff --git a/lib/config/firebase_options.dart b/lib/config/firebase_options.dart index c028dbd46d..1be493933f 100644 --- a/lib/config/firebase_options.dart +++ b/lib/config/firebase_options.dart @@ -1,7 +1,6 @@ // 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' diff --git a/lib/config/routes.dart b/lib/config/routes.dart index 8a58e82c86..ff2b0b55e2 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -1,13 +1,9 @@ -// 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'; diff --git a/lib/config/themes.dart b/lib/config/themes.dart index fd10c678ac..4615eae9c2 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -1,9 +1,7 @@ -// 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'; diff --git a/lib/main.dart b/lib/main.dart index b7ab0ed8c7..f2123f915e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,5 @@ -// 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'; @@ -9,7 +7,6 @@ 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'; diff --git a/lib/pages/add_story/add_story.dart b/lib/pages/add_story/add_story.dart index b6bb42d08b..6f96fdf640 100644 --- a/lib/pages/add_story/add_story.dart +++ b/lib/pages/add_story/add_story.dart @@ -1,11 +1,8 @@ -// 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'; @@ -14,7 +11,6 @@ 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'; diff --git a/lib/pages/add_story/add_story_view.dart b/lib/pages/add_story/add_story_view.dart index 6ab7784098..ea828aadf5 100644 --- a/lib/pages/add_story/add_story_view.dart +++ b/lib/pages/add_story/add_story_view.dart @@ -1,12 +1,9 @@ -// 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 c90d558894..c62a0b8151 100644 --- a/lib/pages/add_story/invite_story_page.dart +++ b/lib/pages/add_story/invite_story_page.dart @@ -1,13 +1,10 @@ -// 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 0b2d8a5401..a3c35c3470 100644 --- a/lib/pages/archive/archive.dart +++ b/lib/pages/archive/archive.dart @@ -1,13 +1,10 @@ -// 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 b56660b29e..fc5c3e250c 100644 --- a/lib/pages/archive/archive_view.dart +++ b/lib/pages/archive/archive_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index add5dd3e93..8a227cb033 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -1,7 +1,5 @@ -// 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'; @@ -10,7 +8,6 @@ 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'; diff --git a/lib/pages/chat/add_widget_tile.dart b/lib/pages/chat/add_widget_tile.dart index 4171083430..11e3cce5d7 100644 --- a/lib/pages/chat/add_widget_tile.dart +++ b/lib/pages/chat/add_widget_tile.dart @@ -1,11 +1,8 @@ -// 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 bfb818a218..d7ac53ef2b 100644 --- a/lib/pages/chat/add_widget_tile_view.dart +++ b/lib/pages/chat/add_widget_tile_view.dart @@ -1,11 +1,8 @@ -// 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 { diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 4fe9c69a45..bfadb1f16b 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -1,15 +1,12 @@ -// 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'; @@ -24,7 +21,6 @@ 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'; diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart index bebaa0f4d8..1cb84b48e3 100644 --- a/lib/pages/chat/chat_app_bar_title.dart +++ b/lib/pages/chat/chat_app_bar_title.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/chat/chat_emoji_picker.dart b/lib/pages/chat/chat_emoji_picker.dart index af766347dd..5e45113be1 100644 --- a/lib/pages/chat/chat_emoji_picker.dart +++ b/lib/pages/chat/chat_emoji_picker.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart index a02ec2fb52..4f83f18e63 100644 --- a/lib/pages/chat/chat_event_list.dart +++ b/lib/pages/chat/chat_event_list.dart @@ -1,5 +1,10 @@ // Flutter imports: -// Project imports: + +import 'package:flutter/material.dart'; + +import 'package:matrix/matrix.dart'; +import 'package:scroll_to_index/scroll_to_index.dart'; + import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/chat/events/message.dart'; @@ -11,10 +16,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'; -// Package imports: -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 4cabd84c29..6c29f4ddd0 100644 --- a/lib/pages/chat/chat_input_row.dart +++ b/lib/pages/chat/chat_input_row.dart @@ -1,14 +1,11 @@ -// 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'; diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 15269ffa08..149055eb02 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -1,8 +1,13 @@ // Flutter imports: -// Package imports: + +import 'package:flutter/material.dart'; + import 'package:badges/badges.dart'; import 'package:desktop_drop/desktop_drop.dart'; -// Project 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:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; @@ -21,11 +26,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 167d34e384..5ab4936040 100644 --- a/lib/pages/chat/command_hints.dart +++ b/lib/pages/chat/command_hints.dart @@ -1,6 +1,5 @@ // 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 1b74ae1e80..0bc7ac3469 100644 --- a/lib/pages/chat/cupertino_widgets_bottom_sheet.dart +++ b/lib/pages/chat/cupertino_widgets_bottom_sheet.dart @@ -1,12 +1,9 @@ -// 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 1362aced84..2ba163feb0 100644 --- a/lib/pages/chat/edit_widgets_dialog.dart +++ b/lib/pages/chat/edit_widgets_dialog.dart @@ -1,11 +1,8 @@ -// 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 38dc1a6816..c68a1c9760 100644 --- a/lib/pages/chat/encryption_button.dart +++ b/lib/pages/chat/encryption_button.dart @@ -1,12 +1,9 @@ -// 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 f230cf477b..e8ff6dad9c 100644 --- a/lib/pages/chat/event_info_dialog.dart +++ b/lib/pages/chat/event_info_dialog.dart @@ -1,14 +1,10 @@ -// 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 9769ef90f5..6335b54bfe 100644 --- a/lib/pages/chat/events/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -1,17 +1,13 @@ -// Dart imports: import 'dart:async'; import 'dart:io'; -// 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'; diff --git a/lib/pages/chat/events/cute_events.dart b/lib/pages/chat/events/cute_events.dart index 8450789b06..6a9424818a 100644 --- a/lib/pages/chat/events/cute_events.dart +++ b/lib/pages/chat/events/cute_events.dart @@ -1,14 +1,10 @@ -// Dart imports: import 'dart:math'; -// 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 { diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart index 7b8d40098c..3a47121f4c 100644 --- a/lib/pages/chat/events/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -1,7 +1,5 @@ -// 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'; @@ -11,7 +9,6 @@ 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'; diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart index a9f40277c3..ae8e7a83e4 100644 --- a/lib/pages/chat/events/image_bubble.dart +++ b/lib/pages/chat/events/image_bubble.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/chat/events/map_bubble.dart b/lib/pages/chat/events/map_bubble.dart index 89c9a43364..c441c7d64c 100644 --- a/lib/pages/chat/events/map_bubble.dart +++ b/lib/pages/chat/events/map_bubble.dart @@ -1,7 +1,5 @@ -// 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 8e71bdf5a2..8fc28bd420 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 3d47072333..a498d22e2d 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart index 3f1d42b4f5..767ea8e7b1 100644 --- a/lib/pages/chat/events/message_download_content.dart +++ b/lib/pages/chat/events/message_download_content.dart @@ -1,10 +1,7 @@ -// 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 { diff --git a/lib/pages/chat/events/message_reactions.dart b/lib/pages/chat/events/message_reactions.dart index 364b78c6e8..7e731c93b9 100644 --- a/lib/pages/chat/events/message_reactions.dart +++ b/lib/pages/chat/events/message_reactions.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 2ad05a288e..4c70ae0046 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -1,11 +1,8 @@ -// 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 9790134f6d..b5e54eba33 100644 --- a/lib/pages/chat/events/state_message.dart +++ b/lib/pages/chat/events/state_message.dart @@ -1,11 +1,8 @@ -// 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 64af7b55ea..8e52bfe397 100644 --- a/lib/pages/chat/events/sticker.dart +++ b/lib/pages/chat/events/sticker.dart @@ -1,12 +1,9 @@ -// 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 eb65b7107a..5a0c75f4b4 100644 --- a/lib/pages/chat/events/verification_request_content.dart +++ b/lib/pages/chat/events/verification_request_content.dart @@ -1,11 +1,8 @@ -// 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 8d24e6c6b2..573e1eb145 100644 --- a/lib/pages/chat/events/video_player.dart +++ b/lib/pages/chat/events/video_player.dart @@ -1,11 +1,8 @@ -// Dart imports: import 'dart:io'; -// 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'; @@ -14,7 +11,6 @@ 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'; diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart index bd126da8b6..7e939b0c92 100644 --- a/lib/pages/chat/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -1,15 +1,12 @@ -// 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'; diff --git a/lib/pages/chat/pinned_events.dart b/lib/pages/chat/pinned_events.dart index 8a4da28572..e7c90c6e13 100644 --- a/lib/pages/chat/pinned_events.dart +++ b/lib/pages/chat/pinned_events.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pages/chat/reactions_picker.dart b/lib/pages/chat/reactions_picker.dart index f60920ef9b..6434c99703 100644 --- a/lib/pages/chat/reactions_picker.dart +++ b/lib/pages/chat/reactions_picker.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/chat/recording_dialog.dart b/lib/pages/chat/recording_dialog.dart index 800c3da34c..c25bd27419 100644 --- a/lib/pages/chat/recording_dialog.dart +++ b/lib/pages/chat/recording_dialog.dart @@ -1,17 +1,13 @@ -// 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: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'; diff --git a/lib/pages/chat/reply_display.dart b/lib/pages/chat/reply_display.dart index 62391811f1..32bec7c25f 100644 --- a/lib/pages/chat/reply_display.dart +++ b/lib/pages/chat/reply_display.dart @@ -1,11 +1,8 @@ -// 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 9475550e27..faac0db4d2 100644 --- a/lib/pages/chat/seen_by_row.dart +++ b/lib/pages/chat/seen_by_row.dart @@ -1,7 +1,5 @@ -// 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 f4fe65efd5..e5f070fd7b 100644 --- a/lib/pages/chat/send_file_dialog.dart +++ b/lib/pages/chat/send_file_dialog.dart @@ -1,13 +1,10 @@ -// 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'; diff --git a/lib/pages/chat/send_location_dialog.dart b/lib/pages/chat/send_location_dialog.dart index 91886e5d10..b2a99004e1 100644 --- a/lib/pages/chat/send_location_dialog.dart +++ b/lib/pages/chat/send_location_dialog.dart @@ -1,17 +1,13 @@ -// 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 ae28b547d5..16065c9162 100644 --- a/lib/pages/chat/sticker_picker_dialog.dart +++ b/lib/pages/chat/sticker_picker_dialog.dart @@ -1,11 +1,8 @@ -// 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 10ad5fc6f8..e080a00095 100644 --- a/lib/pages/chat/tombstone_display.dart +++ b/lib/pages/chat/tombstone_display.dart @@ -1,11 +1,8 @@ -// 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 1fe38e8820..8101fd76fe 100644 --- a/lib/pages/chat/typing_indicators.dart +++ b/lib/pages/chat/typing_indicators.dart @@ -1,7 +1,5 @@ -// 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 a91ed345fb..7a52929cef 100644 --- a/lib/pages/chat/widgets_bottom_sheet.dart +++ b/lib/pages/chat/widgets_bottom_sheet.dart @@ -1,12 +1,9 @@ -// 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 d359168b93..3bdefe8d57 100644 --- a/lib/pages/chat_details/chat_details.dart +++ b/lib/pages/chat_details/chat_details.dart @@ -1,8 +1,6 @@ -// 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'; @@ -13,7 +11,6 @@ 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'; diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 8cede0a825..bfd22fbcf8 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -1,13 +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: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'; diff --git a/lib/pages/chat_details/participant_list_item.dart b/lib/pages/chat_details/participant_list_item.dart index 7fdfe1aad9..adbafe2006 100644 --- a/lib/pages/chat_details/participant_list_item.dart +++ b/lib/pages/chat_details/participant_list_item.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart index 54afb66a79..c7aed03a37 100644 --- a/lib/pages/chat_encryption_settings/chat_encryption_settings.dart +++ b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart @@ -1,7 +1,5 @@ -// 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'; @@ -9,7 +7,6 @@ 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'; 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 1af9a2c7d1..20764021eb 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,10 @@ -// 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'; diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 5cbd6783b8..3567d26241 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -1,13 +1,10 @@ -// 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'; @@ -17,7 +14,6 @@ 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'; diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index 536214f31b..7a47424a98 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart index caa844a952..7ced102442 100644 --- a/lib/pages/chat_list/chat_list_header.dart +++ b/lib/pages/chat_list/chat_list_header.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index c245b64bcd..d535b2e659 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -1,14 +1,11 @@ -// 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'; diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index 48378bdf8a..ccfcf0629e 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index c40c099683..5907d9f089 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -1,18 +1,14 @@ -// Dart imports: import 'dart:developer'; -// 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'; diff --git a/lib/pages/chat_list/navi_rail_item.dart b/lib/pages/chat_list/navi_rail_item.dart index 98df834fab..2004f3568a 100644 --- a/lib/pages/chat_list/navi_rail_item.dart +++ b/lib/pages/chat_list/navi_rail_item.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/config/app_config.dart'; import '../../config/themes.dart'; diff --git a/lib/pages/chat_list/search_title.dart b/lib/pages/chat_list/search_title.dart index 5523d49129..62bcfb6848 100644 --- a/lib/pages/chat_list/search_title.dart +++ b/lib/pages/chat_list/search_title.dart @@ -1,4 +1,3 @@ -// 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 abe7ee2c0a..f885960853 100644 --- a/lib/pages/chat_list/space_view.dart +++ b/lib/pages/chat_list/space_view.dart @@ -1,10 +1,7 @@ -// 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'; @@ -12,7 +9,6 @@ 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'; diff --git a/lib/pages/chat_list/start_chat_fab.dart b/lib/pages/chat_list/start_chat_fab.dart index a7f8e57e56..01f0d41651 100644 --- a/lib/pages/chat_list/start_chat_fab.dart +++ b/lib/pages/chat_list/start_chat_fab.dart @@ -1,14 +1,10 @@ -// Dart imports: import 'dart:core'; -// 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'; diff --git a/lib/pages/chat_list/stories_header.dart b/lib/pages/chat_list/stories_header.dart index 8c150c9227..d5325b91f2 100644 --- a/lib/pages/chat_list/stories_header.dart +++ b/lib/pages/chat_list/stories_header.dart @@ -1,7 +1,5 @@ -// 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'; @@ -9,7 +7,6 @@ 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'; diff --git a/lib/pages/chat_members/chat_members.dart b/lib/pages/chat_members/chat_members.dart index ba20d011db..c777d286e2 100644 --- a/lib/pages/chat_members/chat_members.dart +++ b/lib/pages/chat_members/chat_members.dart @@ -1,10 +1,7 @@ -// 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 e9b282b005..f5250f30ac 100644 --- a/lib/pages/chat_members/chat_members_view.dart +++ b/lib/pages/chat_members/chat_members_view.dart @@ -1,11 +1,8 @@ -// 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 e8560b1f50..a6cdcbef0f 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings.dart @@ -1,17 +1,13 @@ -// Dart imports: import 'dart:developer'; -// 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'; 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 23d65e0052..072e20405f 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/chat_permissions_settings/permission_list_tile.dart b/lib/pages/chat_permissions_settings/permission_list_tile.dart index d6a4188176..a9d159854a 100644 --- a/lib/pages/chat_permissions_settings/permission_list_tile.dart +++ b/lib/pages/chat_permissions_settings/permission_list_tile.dart @@ -1,7 +1,5 @@ -// 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 41f447124a..3ad1266c8c 100644 --- a/lib/pages/device_settings/device_settings.dart +++ b/lib/pages/device_settings/device_settings.dart @@ -1,7 +1,5 @@ -// 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_gen/gen_l10n/l10n.dart'; @@ -9,7 +7,6 @@ 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'; diff --git a/lib/pages/device_settings/device_settings_view.dart b/lib/pages/device_settings/device_settings_view.dart index ebf21d5fdf..4094c02276 100644 --- a/lib/pages/device_settings/device_settings_view.dart +++ b/lib/pages/device_settings/device_settings_view.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pages/device_settings/user_device_list_item.dart b/lib/pages/device_settings/user_device_list_item.dart index 3eb34912e1..db793ac357 100644 --- a/lib/pages/device_settings/user_device_list_item.dart +++ b/lib/pages/device_settings/user_device_list_item.dart @@ -1,12 +1,9 @@ -// 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 1ebbb565e3..a8e5a92020 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -16,15 +16,12 @@ * along with this program. If not, see . */ -// Dart imports: import 'dart:async'; import 'dart:math'; -// 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'; @@ -33,7 +30,6 @@ 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'; diff --git a/lib/pages/dialer/pip/dismiss_keyboard.dart b/lib/pages/dialer/pip/dismiss_keyboard.dart index ab100cfc9e..c9ca3180fb 100644 --- a/lib/pages/dialer/pip/dismiss_keyboard.dart +++ b/lib/pages/dialer/pip/dismiss_keyboard.dart @@ -1,4 +1,3 @@ -// 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 b12d10e676..5396c9136e 100644 --- a/lib/pages/dialer/pip/pip_view.dart +++ b/lib/pages/dialer/pip/pip_view.dart @@ -1,7 +1,5 @@ -// 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 5f41326484..3b7611ed2e 100644 --- a/lib/pages/homeserver_picker/homeserver_app_bar.dart +++ b/lib/pages/homeserver_picker/homeserver_app_bar.dart @@ -1,12 +1,9 @@ -// 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 e91ec07af1..0fc6d0112c 100644 --- a/lib/pages/homeserver_picker/homeserver_bottom_sheet.dart +++ b/lib/pages/homeserver_picker/homeserver_bottom_sheet.dart @@ -1,7 +1,5 @@ -// 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 82b6027800..7c1e82ccf6 100644 --- a/lib/pages/homeserver_picker/homeserver_picker.dart +++ b/lib/pages/homeserver_picker/homeserver_picker.dart @@ -1,11 +1,8 @@ -// 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'; @@ -17,7 +14,6 @@ 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'; diff --git a/lib/pages/homeserver_picker/homeserver_picker_view.dart b/lib/pages/homeserver_picker/homeserver_picker_view.dart index c78cbb8ff9..59301c6a15 100644 --- a/lib/pages/homeserver_picker/homeserver_picker_view.dart +++ b/lib/pages/homeserver_picker/homeserver_picker_view.dart @@ -1,14 +1,14 @@ // Flutter imports: -// Project imports: + +import 'package:flutter/material.dart'; + +import 'package:flutter_gen/gen_l10n/l10n.dart'; + 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'; -// Package imports: -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 ad4d63efb9..94ab19dd43 100644 --- a/lib/pages/image_viewer/image_viewer.dart +++ b/lib/pages/image_viewer/image_viewer.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/image_viewer/image_viewer_view.dart b/lib/pages/image_viewer/image_viewer_view.dart index 248654cac7..7646c8a603 100644 --- a/lib/pages/image_viewer/image_viewer_view.dart +++ b/lib/pages/image_viewer/image_viewer_view.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pages/invitation_selection/invitation_selection.dart b/lib/pages/invitation_selection/invitation_selection.dart index 29b68c0c7b..6736f099a0 100644 --- a/lib/pages/invitation_selection/invitation_selection.dart +++ b/lib/pages/invitation_selection/invitation_selection.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pages/invitation_selection/invitation_selection_view.dart b/lib/pages/invitation_selection/invitation_selection_view.dart index 690975332d..5d55400843 100644 --- a/lib/pages/invitation_selection/invitation_selection_view.dart +++ b/lib/pages/invitation_selection/invitation_selection_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/key_verification/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart index 914f2e43b6..4178259605 100644 --- a/lib/pages/key_verification/key_verification_dialog.dart +++ b/lib/pages/key_verification/key_verification_dialog.dart @@ -1,19 +1,15 @@ -// Dart imports: import 'dart:convert'; import 'dart:ui'; -// 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 { diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 45268150a3..0c6e819e7a 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -1,16 +1,12 @@ -// 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/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart index 9f1102a056..084e054761 100644 --- a/lib/pages/login/login_view.dart +++ b/lib/pages/login/login_view.dart @@ -1,11 +1,11 @@ // Flutter imports: -// Project imports: -import 'package:fluffychat/pangea/utils/password_forgotten.dart'; -import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; + import 'package:flutter/material.dart'; -// Package imports: + import 'package:flutter_gen/gen_l10n/l10n.dart'; +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 987353cceb..b01186a530 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart index 77e096f119..72d663618b 100644 --- a/lib/pages/new_group/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart index 7454dd5a96..c1d8c649a9 100644 --- a/lib/pages/new_private_chat/new_private_chat.dart +++ b/lib/pages/new_private_chat/new_private_chat.dart @@ -1,16 +1,12 @@ -// 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'; 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 2bd61984df..fbe6d04433 100644 --- a/lib/pages/new_private_chat/new_private_chat_view.dart +++ b/lib/pages/new_private_chat/new_private_chat_view.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pages/new_private_chat/qr_scanner_modal.dart b/lib/pages/new_private_chat/qr_scanner_modal.dart index a4bce8eeb0..b509941e5d 100644 --- a/lib/pages/new_private_chat/qr_scanner_modal.dart +++ b/lib/pages/new_private_chat/qr_scanner_modal.dart @@ -1,11 +1,8 @@ -// 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 b97d2509be..2ff854e2cb 100644 --- a/lib/pages/new_space/new_space.dart +++ b/lib/pages/new_space/new_space.dart @@ -1,18 +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'; 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'; diff --git a/lib/pages/new_space/new_space_view.dart b/lib/pages/new_space/new_space_view.dart index dc40e74ac2..32027cb842 100644 --- a/lib/pages/new_space/new_space_view.dart +++ b/lib/pages/new_space/new_space_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart index e6ba63dea2..988ec3ff4d 100644 --- a/lib/pages/settings/settings.dart +++ b/lib/pages/settings/settings.dart @@ -1,10 +1,7 @@ -// 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'; @@ -13,7 +10,6 @@ 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'; diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart index aaa7de7fdb..6025e480b8 100644 --- a/lib/pages/settings/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -1,13 +1,10 @@ -// 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'; diff --git a/lib/pages/settings_3pid/settings_3pid.dart b/lib/pages/settings_3pid/settings_3pid.dart index d96d44b201..d46cac2a9b 100644 --- a/lib/pages/settings_3pid/settings_3pid.dart +++ b/lib/pages/settings_3pid/settings_3pid.dart @@ -1,13 +1,10 @@ -// 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 863f0761ce..101062a63e 100644 --- a/lib/pages/settings_3pid/settings_3pid_view.dart +++ b/lib/pages/settings_3pid/settings_3pid_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/settings_chat/settings_chat.dart b/lib/pages/settings_chat/settings_chat.dart index c07c9a6b8b..1c10355597 100644 --- a/lib/pages/settings_chat/settings_chat.dart +++ b/lib/pages/settings_chat/settings_chat.dart @@ -1,7 +1,5 @@ -// 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 67a8f5e6e5..3ad9a8314d 100644 --- a/lib/pages/settings_chat/settings_chat_view.dart +++ b/lib/pages/settings_chat/settings_chat_view.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pages/settings_emotes/import_archive_dialog.dart b/lib/pages/settings_emotes/import_archive_dialog.dart index 176f0cde17..0ed5bb21f4 100644 --- a/lib/pages/settings_emotes/import_archive_dialog.dart +++ b/lib/pages/settings_emotes/import_archive_dialog.dart @@ -1,18 +1,14 @@ -// 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 5aac6b3b76..2ef905b176 100644 --- a/lib/pages/settings_emotes/settings_emotes.dart +++ b/lib/pages/settings_emotes/settings_emotes.dart @@ -1,11 +1,8 @@ -// 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'; @@ -15,7 +12,6 @@ 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'; diff --git a/lib/pages/settings_emotes/settings_emotes_view.dart b/lib/pages/settings_emotes/settings_emotes_view.dart index 71fdf3aae2..acb93788eb 100644 --- a/lib/pages/settings_emotes/settings_emotes_view.dart +++ b/lib/pages/settings_emotes/settings_emotes_view.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/settings_ignore_list/settings_ignore_list.dart b/lib/pages/settings_ignore_list/settings_ignore_list.dart index 24b00faba8..0b27cee3b3 100644 --- a/lib/pages/settings_ignore_list/settings_ignore_list.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list.dart @@ -1,10 +1,7 @@ -// 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 20e4dabceb..dc0a314684 100644 --- a/lib/pages/settings_ignore_list/settings_ignore_list_view.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list_view.dart @@ -1,12 +1,9 @@ -// 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 9bd4224ddd..276bc08ad2 100644 --- a/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart @@ -1,10 +1,7 @@ -// 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 264c521c5d..8d62549c71 100644 --- a/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/settings_notifications/settings_notifications.dart b/lib/pages/settings_notifications/settings_notifications.dart index 514a973da7..6ab4740aff 100644 --- a/lib/pages/settings_notifications/settings_notifications.dart +++ b/lib/pages/settings_notifications/settings_notifications.dart @@ -1,14 +1,11 @@ -// 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_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 77f1465d7d..65ddac1622 100644 --- a/lib/pages/settings_notifications/settings_notifications_view.dart +++ b/lib/pages/settings_notifications/settings_notifications_view.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pages/settings_security/settings_security.dart b/lib/pages/settings_security/settings_security.dart index 115bafe122..60f746e89e 100644 --- a/lib/pages/settings_security/settings_security.dart +++ b/lib/pages/settings_security/settings_security.dart @@ -1,18 +1,14 @@ -// Dart imports: import 'dart:convert'; 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: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'; diff --git a/lib/pages/settings_security/settings_security_view.dart b/lib/pages/settings_security/settings_security_view.dart index 39368b1033..54e8b4e704 100644 --- a/lib/pages/settings_security/settings_security_view.dart +++ b/lib/pages/settings_security/settings_security_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pages/settings_stories/settings_stories.dart b/lib/pages/settings_stories/settings_stories.dart index 94fcacab1c..16e9208bbc 100644 --- a/lib/pages/settings_stories/settings_stories.dart +++ b/lib/pages/settings_stories/settings_stories.dart @@ -1,11 +1,8 @@ -// 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 010c17dd36..f5d71fab37 100644 --- a/lib/pages/settings_stories/settings_stories_view.dart +++ b/lib/pages/settings_stories/settings_stories_view.dart @@ -1,10 +1,7 @@ -// 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 94acc35c5e..67c6d97389 100644 --- a/lib/pages/settings_style/settings_style.dart +++ b/lib/pages/settings_style/settings_style.dart @@ -1,11 +1,8 @@ -// 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 c05837dab5..9104912e74 100644 --- a/lib/pages/settings_style/settings_style_view.dart +++ b/lib/pages/settings_style/settings_style_view.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pages/story/story_page.dart b/lib/pages/story/story_page.dart index e2f49d44ab..1a0333c2b1 100644 --- a/lib/pages/story/story_page.dart +++ b/lib/pages/story/story_page.dart @@ -1,11 +1,8 @@ -// 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'; @@ -15,7 +12,6 @@ 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'; diff --git a/lib/pages/story/story_view.dart b/lib/pages/story/story_view.dart index c980e3e218..913becfbf1 100644 --- a/lib/pages/story/story_view.dart +++ b/lib/pages/story/story_view.dart @@ -1,15 +1,12 @@ -// 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'; diff --git a/lib/pages/tasks/model/matrix_todo_list.dart b/lib/pages/tasks/model/matrix_todo_list.dart index 428822338b..fdcb889709 100644 --- a/lib/pages/tasks/model/matrix_todo_list.dart +++ b/lib/pages/tasks/model/matrix_todo_list.dart @@ -1,4 +1,3 @@ -// 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 7c77bb2ebd..7743b99e5d 100644 --- a/lib/pages/tasks/tasks.dart +++ b/lib/pages/tasks/tasks.dart @@ -1,12 +1,9 @@ -// 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 dcff18c24d..8046b44d16 100644 --- a/lib/pages/tasks/tasks_view.dart +++ b/lib/pages/tasks/tasks_view.dart @@ -1,11 +1,8 @@ -// 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 3dd8deea30..9d87f559c3 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet.dart @@ -1,14 +1,11 @@ -// 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 93677a643d..bdb1d945ee 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,8 @@ -// 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'; diff --git a/lib/pangea/choreographer/controllers/alternative_translator.dart b/lib/pangea/choreographer/controllers/alternative_translator.dart index ada4fb890f..4221a34799 100644 --- a/lib/pangea/choreographer/controllers/alternative_translator.dart +++ b/lib/pangea/choreographer/controllers/alternative_translator.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pangea/choreographer/controllers/analytics_sender.dart b/lib/pangea/choreographer/controllers/analytics_sender.dart index 1dd75e7c99..fe4575f384 100644 --- a/lib/pangea/choreographer/controllers/analytics_sender.dart +++ b/lib/pangea/choreographer/controllers/analytics_sender.dart @@ -1,4 +1,3 @@ -// 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 14ff95eb2f..6c3dd830e5 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pangea/choreographer/controllers/error_service.dart b/lib/pangea/choreographer/controllers/error_service.dart index a2548ff3ca..8ec044244f 100644 --- a/lib/pangea/choreographer/controllers/error_service.dart +++ b/lib/pangea/choreographer/controllers/error_service.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import '../../utils/error_handler.dart'; diff --git a/lib/pangea/choreographer/controllers/igc_controller.dart b/lib/pangea/choreographer/controllers/igc_controller.dart index fdd9362fea..2c341811a6 100644 --- a/lib/pangea/choreographer/controllers/igc_controller.dart +++ b/lib/pangea/choreographer/controllers/igc_controller.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index 12c823452f..a541eb27ec 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pangea/choreographer/controllers/message_options.dart b/lib/pangea/choreographer/controllers/message_options.dart index f3a69e1544..0e5e684617 100644 --- a/lib/pangea/choreographer/controllers/message_options.dart +++ b/lib/pangea/choreographer/controllers/message_options.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/choreographer/widgets/choice_array.dart b/lib/pangea/choreographer/widgets/choice_array.dart index f309a7039b..9b9b2af0e0 100644 --- a/lib/pangea/choreographer/widgets/choice_array.dart +++ b/lib/pangea/choreographer/widgets/choice_array.dart @@ -1,14 +1,10 @@ -// 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 d87f6a60b5..484da0fe3b 100644 --- a/lib/pangea/choreographer/widgets/counters.dart +++ b/lib/pangea/choreographer/widgets/counters.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/choreographer/widgets/has_error_button.dart b/lib/pangea/choreographer/widgets/has_error_button.dart index b30026da16..8c04bad779 100644 --- a/lib/pangea/choreographer/widgets/has_error_button.dart +++ b/lib/pangea/choreographer/widgets/has_error_button.dart @@ -1,7 +1,5 @@ -// 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 108c7dc366..3bbb84f424 100644 --- a/lib/pangea/choreographer/widgets/it_bar.dart +++ b/lib/pangea/choreographer/widgets/it_bar.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/choreographer/widgets/it_bar_buttons.dart b/lib/pangea/choreographer/widgets/it_bar_buttons.dart index b74c0e8bca..eecadbe971 100644 --- a/lib/pangea/choreographer/widgets/it_bar_buttons.dart +++ b/lib/pangea/choreographer/widgets/it_bar_buttons.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/choreographer/widgets/it_shimmer.dart b/lib/pangea/choreographer/widgets/it_shimmer.dart index 1ae0173d15..c9a570fe51 100644 --- a/lib/pangea/choreographer/widgets/it_shimmer.dart +++ b/lib/pangea/choreographer/widgets/it_shimmer.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:ui'; -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/config/app_config.dart'; class ItShimmer extends StatelessWidget { diff --git a/lib/pangea/choreographer/widgets/language_display_toggle.dart b/lib/pangea/choreographer/widgets/language_display_toggle.dart index 085435049a..a634a73e22 100644 --- a/lib/pangea/choreographer/widgets/language_display_toggle.dart +++ b/lib/pangea/choreographer/widgets/language_display_toggle.dart @@ -1,10 +1,7 @@ -// 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 21096782e7..ef444a5338 100644 --- a/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart +++ b/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart @@ -1,17 +1,13 @@ -// 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: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'; diff --git a/lib/pangea/choreographer/widgets/send_button.dart b/lib/pangea/choreographer/widgets/send_button.dart index 6a541eff04..36d19ece2c 100644 --- a/lib/pangea/choreographer/widgets/send_button.dart +++ b/lib/pangea/choreographer/widgets/send_button.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/choreographer/widgets/translation_finished_flow.dart b/lib/pangea/choreographer/widgets/translation_finished_flow.dart index f88139307b..b634245654 100644 --- a/lib/pangea/choreographer/widgets/translation_finished_flow.dart +++ b/lib/pangea/choreographer/widgets/translation_finished_flow.dart @@ -1,7 +1,5 @@ -// 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 988f66d9a8..43a3f2e231 100644 --- a/lib/pangea/config/colors.dart +++ b/lib/pangea/config/colors.dart @@ -1,4 +1,3 @@ -// Flutter imports: import 'package:flutter/material.dart'; class ChoreoColor { diff --git a/lib/pangea/config/environment.dart b/lib/pangea/config/environment.dart index 548574c0a6..f9eaf43ded 100644 --- a/lib/pangea/config/environment.dart +++ b/lib/pangea/config/environment.dart @@ -1,10 +1,7 @@ -// 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 8d937ec2ee..cbdfdf7d00 100644 --- a/lib/pangea/constants/choreo_constants.dart +++ b/lib/pangea/constants/choreo_constants.dart @@ -1,4 +1,3 @@ -// 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 5a5ce14ccc..97522ca4b4 100644 --- a/lib/pangea/constants/class_default_values.dart +++ b/lib/pangea/constants/class_default_values.dart @@ -1,4 +1,3 @@ -// Project imports: import '../enum/time_span.dart'; class ClassDefaultValues { diff --git a/lib/pangea/constants/colors.dart b/lib/pangea/constants/colors.dart index ef19ca1848..16fc7f907a 100644 --- a/lib/pangea/constants/colors.dart +++ b/lib/pangea/constants/colors.dart @@ -1,4 +1,3 @@ -// 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 b3822c46f1..ce41353e8b 100644 --- a/lib/pangea/controllers/base_controller.dart +++ b/lib/pangea/controllers/base_controller.dart @@ -1,4 +1,3 @@ -// Dart imports: import 'dart:async'; class BaseController { diff --git a/lib/pangea/controllers/class_controller.dart b/lib/pangea/controllers/class_controller.dart index edd435c5c5..894498a495 100644 --- a/lib/pangea/controllers/class_controller.dart +++ b/lib/pangea/controllers/class_controller.dart @@ -1,18 +1,14 @@ -// 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'; diff --git a/lib/pangea/controllers/contextual_definition_controller.dart b/lib/pangea/controllers/contextual_definition_controller.dart index 332b61c9af..a8947aea7d 100644 --- a/lib/pangea/controllers/contextual_definition_controller.dart +++ b/lib/pangea/controllers/contextual_definition_controller.dart @@ -1,14 +1,10 @@ -// Dart imports: import 'dart:convert'; -// 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'; diff --git a/lib/pangea/controllers/language_controller.dart b/lib/pangea/controllers/language_controller.dart index 4482b55e0c..b96c82b8b1 100644 --- a/lib/pangea/controllers/language_controller.dart +++ b/lib/pangea/controllers/language_controller.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pangea/controllers/language_list_controller.dart b/lib/pangea/controllers/language_list_controller.dart index 940e06faff..e713b662af 100644 --- a/lib/pangea/controllers/language_list_controller.dart +++ b/lib/pangea/controllers/language_list_controller.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/controllers/local_settings.dart b/lib/pangea/controllers/local_settings.dart index 494b96c959..5984a7bf56 100644 --- a/lib/pangea/controllers/local_settings.dart +++ b/lib/pangea/controllers/local_settings.dart @@ -1,4 +1,3 @@ -// 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 32139a5789..fe4e6d9d4a 100644 --- a/lib/pangea/controllers/message_analytics_controller.dart +++ b/lib/pangea/controllers/message_analytics_controller.dart @@ -1,13 +1,9 @@ -// 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'; diff --git a/lib/pangea/controllers/message_data_controller.dart b/lib/pangea/controllers/message_data_controller.dart index 1bb3d10f2e..87f357cabc 100644 --- a/lib/pangea/controllers/message_data_controller.dart +++ b/lib/pangea/controllers/message_data_controller.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart index 1f687b1d3c..1b2863284b 100644 --- a/lib/pangea/controllers/my_analytics_controller.dart +++ b/lib/pangea/controllers/my_analytics_controller.dart @@ -1,14 +1,10 @@ -// 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'; diff --git a/lib/pangea/controllers/pangea_controller.dart b/lib/pangea/controllers/pangea_controller.dart index e650569818..728f861316 100644 --- a/lib/pangea/controllers/pangea_controller.dart +++ b/lib/pangea/controllers/pangea_controller.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pangea/controllers/permissions_controller.dart b/lib/pangea/controllers/permissions_controller.dart index 44c0b79fef..6dcf643886 100644 --- a/lib/pangea/controllers/permissions_controller.dart +++ b/lib/pangea/controllers/permissions_controller.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/controllers/space_rules_edit_controller.dart b/lib/pangea/controllers/space_rules_edit_controller.dart index 3e11b10551..5f5a2ed726 100644 --- a/lib/pangea/controllers/space_rules_edit_controller.dart +++ b/lib/pangea/controllers/space_rules_edit_controller.dart @@ -1,7 +1,5 @@ -// 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 1ade5895a7..1cd26a54fd 100644 --- a/lib/pangea/controllers/subscription_controller.dart +++ b/lib/pangea/controllers/subscription_controller.dart @@ -1,19 +1,15 @@ -// 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'; diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 20ff0c5a35..aeec7a5dce 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -1,18 +1,15 @@ -// 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; + import 'package:fluffychat/pangea/constants/language_keys.dart'; -// 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 04fe5e878f..b909f91757 100644 --- a/lib/pangea/controllers/word_net_controller.dart +++ b/lib/pangea/controllers/word_net_controller.dart @@ -1,8 +1,6 @@ -// Package imports: import 'package:collection/collection.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'; diff --git a/lib/pangea/enum/bar_chart_view_enum.dart b/lib/pangea/enum/bar_chart_view_enum.dart index bdc21707d8..d59f34d9ab 100644 --- a/lib/pangea/enum/bar_chart_view_enum.dart +++ b/lib/pangea/enum/bar_chart_view_enum.dart @@ -1,7 +1,5 @@ -// 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 03a0adcaa2..7ba748d09e 100644 --- a/lib/pangea/enum/span_choice_type.dart +++ b/lib/pangea/enum/span_choice_type.dart @@ -1,7 +1,5 @@ -// 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 d5e7143302..5e4fdf8cbc 100644 --- a/lib/pangea/enum/span_data_type.dart +++ b/lib/pangea/enum/span_data_type.dart @@ -1,7 +1,5 @@ -// 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 12457aac62..23a54e4eaf 100644 --- a/lib/pangea/enum/time_span.dart +++ b/lib/pangea/enum/time_span.dart @@ -1,10 +1,7 @@ -// 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 c657fa9617..771b262209 100644 --- a/lib/pangea/enum/use_type.dart +++ b/lib/pangea/enum/use_type.dart @@ -1,10 +1,7 @@ -// 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 0b17493874..73187dbf79 100644 --- a/lib/pangea/enum/vocab_proficiency_enum.dart +++ b/lib/pangea/enum/vocab_proficiency_enum.dart @@ -1,7 +1,5 @@ -// 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 7532660105..6012383d54 100644 --- a/lib/pangea/extensions/client_extension.dart +++ b/lib/pangea/extensions/client_extension.dart @@ -1,14 +1,10 @@ -// 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'; diff --git a/lib/pangea/extensions/pangea_event_extension.dart b/lib/pangea/extensions/pangea_event_extension.dart index 17b566db79..9d45567218 100644 --- a/lib/pangea/extensions/pangea_event_extension.dart +++ b/lib/pangea/extensions/pangea_event_extension.dart @@ -1,13 +1,9 @@ -// 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'; diff --git a/lib/pangea/extensions/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension.dart index 9946145135..ff8ea326a8 100644 --- a/lib/pangea/extensions/pangea_room_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension.dart @@ -1,17 +1,13 @@ -// 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'; diff --git a/lib/pangea/guard/p_vguard.dart b/lib/pangea/guard/p_vguard.dart index 48719c8d7b..20ddd35d6d 100644 --- a/lib/pangea/guard/p_vguard.dart +++ b/lib/pangea/guard/p_vguard.dart @@ -1,13 +1,9 @@ -// Dart imports: import 'dart:async'; -// 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'; diff --git a/lib/pangea/models/base_subscription_info.dart b/lib/pangea/models/base_subscription_info.dart index 82540ceccb..604abf6e96 100644 --- a/lib/pangea/models/base_subscription_info.dart +++ b/lib/pangea/models/base_subscription_info.dart @@ -1,4 +1,3 @@ -// 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 46c1bc818d..0b0cb085d5 100644 --- a/lib/pangea/models/chart_analytics_model.dart +++ b/lib/pangea/models/chart_analytics_model.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:developer'; -// 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'; diff --git a/lib/pangea/models/chat_topic_model.dart b/lib/pangea/models/chat_topic_model.dart index cba79e4ae0..c83e3f7c69 100644 --- a/lib/pangea/models/chat_topic_model.dart +++ b/lib/pangea/models/chat_topic_model.dart @@ -1,4 +1,3 @@ -// Project imports: import 'lemma.dart'; class ChatTopic { diff --git a/lib/pangea/models/choreo_record.dart b/lib/pangea/models/choreo_record.dart index 232db0df37..5a2a457d64 100644 --- a/lib/pangea/models/choreo_record.dart +++ b/lib/pangea/models/choreo_record.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/models/class_analytics_model.dart b/lib/pangea/models/class_analytics_model.dart index b908a983f4..8c55be5aa4 100644 --- a/lib/pangea/models/class_analytics_model.dart +++ b/lib/pangea/models/class_analytics_model.dart @@ -1,4 +1,3 @@ -// 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 bd4c6d73ee..b58a5f56a1 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/class_model.dart @@ -1,15 +1,11 @@ -// 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: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'; diff --git a/lib/pangea/models/construct_analytics_event.dart b/lib/pangea/models/construct_analytics_event.dart index e9cec2676f..66921b8a23 100644 --- a/lib/pangea/models/construct_analytics_event.dart +++ b/lib/pangea/models/construct_analytics_event.dart @@ -1,7 +1,5 @@ -// Package imports: import 'package:matrix/matrix.dart'; -// Project imports: import 'package:fluffychat/pangea/models/constructs_analytics_model.dart'; import '../constants/pangea_event_types.dart'; diff --git a/lib/pangea/models/constructs_analytics_model.dart b/lib/pangea/models/constructs_analytics_model.dart index e72288543a..03b2069af5 100644 --- a/lib/pangea/models/constructs_analytics_model.dart +++ b/lib/pangea/models/constructs_analytics_model.dart @@ -1,11 +1,8 @@ -// Dart imports: import 'dart:developer'; -// 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'; diff --git a/lib/pangea/models/custom_input_translation_model.dart b/lib/pangea/models/custom_input_translation_model.dart index 9b96db3437..6a45911c92 100644 --- a/lib/pangea/models/custom_input_translation_model.dart +++ b/lib/pangea/models/custom_input_translation_model.dart @@ -1,4 +1,3 @@ -// 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 d311193dba..42ce2a175b 100644 --- a/lib/pangea/models/exchange_model.dart +++ b/lib/pangea/models/exchange_model.dart @@ -1,10 +1,7 @@ -// 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/utils/error_handler.dart'; import 'class_model.dart'; diff --git a/lib/pangea/models/headwords.dart b/lib/pangea/models/headwords.dart index 00917d31f5..13253ba8fb 100644 --- a/lib/pangea/models/headwords.dart +++ b/lib/pangea/models/headwords.dart @@ -1,12 +1,9 @@ -// Dart imports: import 'dart:convert'; import 'dart:developer'; -// 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'; diff --git a/lib/pangea/models/igc_text_data_model.dart b/lib/pangea/models/igc_text_data_model.dart index aff53a2c1b..8f6f749282 100644 --- a/lib/pangea/models/igc_text_data_model.dart +++ b/lib/pangea/models/igc_text_data_model.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pangea/models/it_response_model.dart b/lib/pangea/models/it_response_model.dart index 83c3092cd1..86a9c7a4c9 100644 --- a/lib/pangea/models/it_response_model.dart +++ b/lib/pangea/models/it_response_model.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/models/it_step.dart b/lib/pangea/models/it_step.dart index 158a85226b..f06bd74015 100644 --- a/lib/pangea/models/it_step.dart +++ b/lib/pangea/models/it_step.dart @@ -1,7 +1,5 @@ -// 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 79ecd14c9e..02d3f706e7 100644 --- a/lib/pangea/models/language_model.dart +++ b/lib/pangea/models/language_model.dart @@ -1,14 +1,10 @@ -// 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/pangea/constants/language_keys.dart'; import '../utils/error_handler.dart'; diff --git a/lib/pangea/models/message_data_models.dart b/lib/pangea/models/message_data_models.dart index 8518b8b9ec..1ed2f36ce6 100644 --- a/lib/pangea/models/message_data_models.dart +++ b/lib/pangea/models/message_data_models.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:convert'; -// 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] diff --git a/lib/pangea/models/mobile_subscriptions.dart b/lib/pangea/models/mobile_subscriptions.dart index 7988fee18e..559cc44b10 100644 --- a/lib/pangea/models/mobile_subscriptions.dart +++ b/lib/pangea/models/mobile_subscriptions.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pangea/models/pangea_choreo_event.dart b/lib/pangea/models/pangea_choreo_event.dart index 21d70923a5..f28f04b046 100644 --- a/lib/pangea/models/pangea_choreo_event.dart +++ b/lib/pangea/models/pangea_choreo_event.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/models/pangea_match_model.dart b/lib/pangea/models/pangea_match_model.dart index 55145c401a..40c8b2afc0 100644 --- a/lib/pangea/models/pangea_match_model.dart +++ b/lib/pangea/models/pangea_match_model.dart @@ -1,11 +1,8 @@ -// Dart imports: import 'dart:developer'; -// 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'; diff --git a/lib/pangea/models/pangea_message_event.dart b/lib/pangea/models/pangea_message_event.dart index 276b21c3a0..b56402c089 100644 --- a/lib/pangea/models/pangea_message_event.dart +++ b/lib/pangea/models/pangea_message_event.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/models/pangea_representation_event.dart b/lib/pangea/models/pangea_representation_event.dart index 8bc4112de0..49e0f9358d 100644 --- a/lib/pangea/models/pangea_representation_event.dart +++ b/lib/pangea/models/pangea_representation_event.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pangea/models/pangea_token_model.dart b/lib/pangea/models/pangea_token_model.dart index 5f828fae32..14497ab157 100644 --- a/lib/pangea/models/pangea_token_model.dart +++ b/lib/pangea/models/pangea_token_model.dart @@ -1,13 +1,9 @@ -// 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 bb747b8cce..244455766f 100644 --- a/lib/pangea/models/pangea_tokens_event.dart +++ b/lib/pangea/models/pangea_tokens_event.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/models/removed_translation.dart b/lib/pangea/models/removed_translation.dart index 5605e44c63..6887476fed 100644 --- a/lib/pangea/models/removed_translation.dart +++ b/lib/pangea/models/removed_translation.dart @@ -1,4 +1,3 @@ -// 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 17cd441560..8a252e67b1 100644 --- a/lib/pangea/models/span_card_model.dart +++ b/lib/pangea/models/span_card_model.dart @@ -1,4 +1,3 @@ -// 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 70af44d397..af9edebe8b 100644 --- a/lib/pangea/models/span_data.dart +++ b/lib/pangea/models/span_data.dart @@ -4,13 +4,10 @@ // SpanChoice of text in message from options // Call to server for additional/followup info -// 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 cb6cefafa6..c6e8274a86 100644 --- a/lib/pangea/models/student_analytics_event.dart +++ b/lib/pangea/models/student_analytics_event.dart @@ -1,13 +1,9 @@ -// 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'; diff --git a/lib/pangea/models/student_analytics_summary_model.dart b/lib/pangea/models/student_analytics_summary_model.dart index 9cc4a0a172..df13f32397 100644 --- a/lib/pangea/models/student_analytics_summary_model.dart +++ b/lib/pangea/models/student_analytics_summary_model.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:convert'; -// Flutter imports: import 'package:flutter/foundation.dart'; -// Project imports: import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../enum/use_type.dart'; diff --git a/lib/pangea/models/system_choice_translation_model.dart b/lib/pangea/models/system_choice_translation_model.dart index e6dcf17944..6914044d39 100644 --- a/lib/pangea/models/system_choice_translation_model.dart +++ b/lib/pangea/models/system_choice_translation_model.dart @@ -1,4 +1,3 @@ -// Project imports: import '../constants/model_keys.dart'; class SystemChoiceRequestModel { diff --git a/lib/pangea/models/textChangeModel.dart b/lib/pangea/models/textChangeModel.dart index 333604fae6..38a988df89 100644 --- a/lib/pangea/models/textChangeModel.dart +++ b/lib/pangea/models/textChangeModel.dart @@ -1,4 +1,3 @@ -// 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 a7ffe58513..f1ee6feca4 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -1,14 +1,10 @@ -// Dart imports: import 'dart:convert'; -// 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 4235bdaaaa..97a7e91c15 100644 --- a/lib/pangea/models/user_profile_search_model.dart +++ b/lib/pangea/models/user_profile_search_model.dart @@ -1,8 +1,6 @@ -// 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 d8f001ea04..7884659160 100644 --- a/lib/pangea/models/web_subscriptions.dart +++ b/lib/pangea/models/web_subscriptions.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/models/widget_measurement.dart b/lib/pangea/models/widget_measurement.dart index d9bf48bb91..851abec624 100644 --- a/lib/pangea/models/widget_measurement.dart +++ b/lib/pangea/models/widget_measurement.dart @@ -1,4 +1,3 @@ -// 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 07e04150f5..838240725d 100644 --- a/lib/pangea/models/word_data_model.dart +++ b/lib/pangea/models/word_data_model.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/network/p_api_exception.dart b/lib/pangea/network/p_api_exception.dart index 26562f53f1..536e5d97b7 100644 --- a/lib/pangea/network/p_api_exception.dart +++ b/lib/pangea/network/p_api_exception.dart @@ -1,10 +1,7 @@ -// 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 e58c2e8fca..241b84d417 100644 --- a/lib/pangea/network/requests.dart +++ b/lib/pangea/network/requests.dart @@ -1,10 +1,7 @@ -// 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 602dde2571..0cd4c2e9ca 100644 --- a/lib/pangea/network/urls.dart +++ b/lib/pangea/network/urls.dart @@ -1,6 +1,5 @@ //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 e1b8db63e3..0cf241a241 100644 --- a/lib/pangea/pages/analytics/analytics_list_tile.dart +++ b/lib/pangea/pages/analytics/analytics_list_tile.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pangea/pages/analytics/bar_chart_card.dart b/lib/pangea/pages/analytics/bar_chart_card.dart index 4199d8ff7a..f68afb5e44 100644 --- a/lib/pangea/pages/analytics/bar_chart_card.dart +++ b/lib/pangea/pages/analytics/bar_chart_card.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Package imports: import 'package:fl_chart/fl_chart.dart'; class BarChartCard extends StatelessWidget { diff --git a/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart b/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart index 46f710fed0..6dcb18a4f9 100644 --- a/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart +++ b/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart @@ -1,10 +1,7 @@ -// 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 3c49241994..c96ccd19fb 100644 --- a/lib/pangea/pages/analytics/base_analytics_page.dart +++ b/lib/pangea/pages/analytics/base_analytics_page.dart @@ -1,13 +1,9 @@ -// Dart imports: import 'dart:math'; -// 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'; diff --git a/lib/pangea/pages/analytics/chart_view_picker_button.dart b/lib/pangea/pages/analytics/chart_view_picker_button.dart index 64ec3c97c7..a3c4b93d0d 100644 --- a/lib/pangea/pages/analytics/chart_view_picker_button.dart +++ b/lib/pangea/pages/analytics/chart_view_picker_button.dart @@ -1,10 +1,7 @@ -// 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 365542f0bb..cea564d18d 100644 --- a/lib/pangea/pages/analytics/class_analytics/class_analytics.dart +++ b/lib/pangea/pages/analytics/class_analytics/class_analytics.dart @@ -1,16 +1,12 @@ -// 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'; 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 e010044e05..beb871571c 100644 --- a/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart +++ b/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart @@ -1,10 +1,7 @@ -// 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 e2a0ee2aff..24c54d38b2 100644 --- a/lib/pangea/pages/analytics/class_list/class_list.dart +++ b/lib/pangea/pages/analytics/class_list/class_list.dart @@ -1,13 +1,9 @@ -// Dart imports: import 'dart:async'; -// 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'; 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 3f166ded2e..99c6b0f261 100644 --- a/lib/pangea/pages/analytics/class_list/class_list_view.dart +++ b/lib/pangea/pages/analytics/class_list/class_list_view.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pangea/pages/analytics/construct_cloud.dart b/lib/pangea/pages/analytics/construct_cloud.dart index 9629012018..5ca2656e7b 100644 --- a/lib/pangea/pages/analytics/construct_cloud.dart +++ b/lib/pangea/pages/analytics/construct_cloud.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/pages/analytics/construct_list.dart b/lib/pangea/pages/analytics/construct_list.dart index b4862d89d2..8cda4b4b27 100644 --- a/lib/pangea/pages/analytics/construct_list.dart +++ b/lib/pangea/pages/analytics/construct_list.dart @@ -1,14 +1,10 @@ -// 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'; diff --git a/lib/pangea/pages/analytics/list_summary_analytics.dart b/lib/pangea/pages/analytics/list_summary_analytics.dart index a35ae44494..f98eac68e8 100644 --- a/lib/pangea/pages/analytics/list_summary_analytics.dart +++ b/lib/pangea/pages/analytics/list_summary_analytics.dart @@ -1,13 +1,9 @@ -// Dart imports: import 'dart:math'; -// 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'; diff --git a/lib/pangea/pages/analytics/messages_bar_chart.dart b/lib/pangea/pages/analytics/messages_bar_chart.dart index 52ebc979ff..9f0c280ead 100644 --- a/lib/pangea/pages/analytics/messages_bar_chart.dart +++ b/lib/pangea/pages/analytics/messages_bar_chart.dart @@ -1,15 +1,11 @@ -// Dart imports: import 'dart:developer'; -// 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'; diff --git a/lib/pangea/pages/analytics/messages_legend_widget.dart b/lib/pangea/pages/analytics/messages_legend_widget.dart index 1304904303..1ee63a3c30 100644 --- a/lib/pangea/pages/analytics/messages_legend_widget.dart +++ b/lib/pangea/pages/analytics/messages_legend_widget.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/pangea/enum/use_type.dart'; class MessagesLegendsListWidget extends StatelessWidget { diff --git a/lib/pangea/pages/analytics/student_analytics/student_analytics.dart b/lib/pangea/pages/analytics/student_analytics/student_analytics.dart index f3de8e2b5d..229a505d9e 100644 --- a/lib/pangea/pages/analytics/student_analytics/student_analytics.dart +++ b/lib/pangea/pages/analytics/student_analytics/student_analytics.dart @@ -1,14 +1,10 @@ -// 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'; 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 1f065b6b55..30572deb6c 100644 --- a/lib/pangea/pages/analytics/student_analytics/student_analytics_view.dart +++ b/lib/pangea/pages/analytics/student_analytics/student_analytics_view.dart @@ -1,11 +1,8 @@ -// 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 1f363cfad2..1ac5fe96a0 100644 --- a/lib/pangea/pages/analytics/time_span_menu_button.dart +++ b/lib/pangea/pages/analytics/time_span_menu_button.dart @@ -1,10 +1,7 @@ -// 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 1c5f830793..2a5f216c17 100644 --- a/lib/pangea/pages/analytics/vocab_bar_chart.dart +++ b/lib/pangea/pages/analytics/vocab_bar_chart.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/pages/analytics/vocab_legend_widget.dart b/lib/pangea/pages/analytics/vocab_legend_widget.dart index f35c45998f..433d4727b5 100644 --- a/lib/pangea/pages/analytics/vocab_legend_widget.dart +++ b/lib/pangea/pages/analytics/vocab_legend_widget.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/pangea/enum/use_type.dart'; class VocabLegendsListWidget extends StatelessWidget { diff --git a/lib/pangea/pages/class_analytics/measure_able.dart b/lib/pangea/pages/class_analytics/measure_able.dart index 3d5e4a7323..8e689b6284 100644 --- a/lib/pangea/pages/class_analytics/measure_able.dart +++ b/lib/pangea/pages/class_analytics/measure_able.dart @@ -1,4 +1,3 @@ -// 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 66f6e84cde..0c2ff63c54 100644 --- a/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart +++ b/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart @@ -1,10 +1,7 @@ -// 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'; @@ -12,7 +9,6 @@ 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 { diff --git a/lib/pangea/pages/class_settings/class_name_header.dart b/lib/pangea/pages/class_settings/class_name_header.dart index adc9d8163c..792cac5655 100644 --- a/lib/pangea/pages/class_settings/class_name_header.dart +++ b/lib/pangea/pages/class_settings/class_name_header.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/pages/class_settings/class_settings_page.dart b/lib/pangea/pages/class_settings/class_settings_page.dart index 5f4477534c..4d8db9cdeb 100644 --- a/lib/pangea/pages/class_settings/class_settings_page.dart +++ b/lib/pangea/pages/class_settings/class_settings_page.dart @@ -1,17 +1,13 @@ -// Dart imports: import 'dart:async'; 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: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'; diff --git a/lib/pangea/pages/class_settings/class_settings_view.dart b/lib/pangea/pages/class_settings/class_settings_view.dart index df5254fa29..f4fca0e18f 100644 --- a/lib/pangea/pages/class_settings/class_settings_view.dart +++ b/lib/pangea/pages/class_settings/class_settings_view.dart @@ -1,12 +1,9 @@ -// 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'; 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 0bc4c288f9..bcb11d030f 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,7 +1,5 @@ -// 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 05df04a895..dba874cfca 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,11 +1,8 @@ -// 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 { 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 156e533830..134f862566 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,10 +1,7 @@ -// 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 e9e907d103..e4741ac451 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,12 @@ -// 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'; 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 c8879b0c50..1894623032 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,11 +1,8 @@ -// 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'; 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 291e21aa49..3d144766d6 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,7 +1,5 @@ -// 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 c6f65b54b6..07dbb6a030 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,7 +1,5 @@ -// 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 c1e8c9771f..7e3fc3af60 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,13 +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: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'; 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 0f5555fe99..afe696658a 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,12 +1,9 @@ -// 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'; diff --git a/lib/pangea/pages/connect/p_sso_button.dart b/lib/pangea/pages/connect/p_sso_button.dart index 42226bb85c..b784013bf2 100644 --- a/lib/pangea/pages/connect/p_sso_button.dart +++ b/lib/pangea/pages/connect/p_sso_button.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pangea/pages/exchange/add_exchange_to_class.dart b/lib/pangea/pages/exchange/add_exchange_to_class.dart index 477ac303b1..87f00e1c5c 100644 --- a/lib/pangea/pages/exchange/add_exchange_to_class.dart +++ b/lib/pangea/pages/exchange/add_exchange_to_class.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/pages/find_partner/find_partner.dart b/lib/pangea/pages/find_partner/find_partner.dart index bd37c899a6..3882eece02 100644 --- a/lib/pangea/pages/find_partner/find_partner.dart +++ b/lib/pangea/pages/find_partner/find_partner.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:async'; -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/models/user_model.dart'; import '../../../widgets/matrix.dart'; diff --git a/lib/pangea/pages/find_partner/find_partner_view.dart b/lib/pangea/pages/find_partner/find_partner_view.dart index b96a6b9176..ff2e8ed597 100644 --- a/lib/pangea/pages/find_partner/find_partner_view.dart +++ b/lib/pangea/pages/find_partner/find_partner_view.dart @@ -1,13 +1,10 @@ -// 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'; diff --git a/lib/pangea/pages/new_class/new_class.dart b/lib/pangea/pages/new_class/new_class.dart index 30d5ae0de4..5d05c990c6 100644 --- a/lib/pangea/pages/new_class/new_class.dart +++ b/lib/pangea/pages/new_class/new_class.dart @@ -1,18 +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'; 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'; diff --git a/lib/pangea/pages/new_class/new_class_view.dart b/lib/pangea/pages/new_class/new_class_view.dart index e40cc08ce5..fa3e5391de 100644 --- a/lib/pangea/pages/new_class/new_class_view.dart +++ b/lib/pangea/pages/new_class/new_class_view.dart @@ -1,11 +1,8 @@ -// 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'; 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 699dd2fcf4..c28a0a1a37 100644 --- a/lib/pangea/pages/p_user_age/p_user_age.dart +++ b/lib/pangea/pages/p_user_age/p_user_age.dart @@ -1,15 +1,11 @@ -// 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'; 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 b4f5e9e491..3b4472971b 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,11 +1,8 @@ -// 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/pages/p_user_age/p_user_age.dart'; import '../../../widgets/layouts/login_scaffold.dart'; diff --git a/lib/pangea/pages/settings_learning/settings_learning.dart b/lib/pangea/pages/settings_learning/settings_learning.dart index 49554c3e38..f0c648d58d 100644 --- a/lib/pangea/pages/settings_learning/settings_learning.dart +++ b/lib/pangea/pages/settings_learning/settings_learning.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index cdc394a4c5..fa9df6264d 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/pages/settings_subscription/change_subscription.dart b/lib/pangea/pages/settings_subscription/change_subscription.dart index e1dde3de30..8a57a317f6 100644 --- a/lib/pangea/pages/settings_subscription/change_subscription.dart +++ b/lib/pangea/pages/settings_subscription/change_subscription.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/pangea/pages/settings_subscription/settings_subscription.dart b/lib/pangea/pages/settings_subscription/settings_subscription.dart index ddd67ff878..bec0098ff4 100644 --- a/lib/pangea/pages/settings_subscription/settings_subscription.dart +++ b/lib/pangea/pages/settings_subscription/settings_subscription.dart @@ -1,13 +1,9 @@ -// 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'; diff --git a/lib/pangea/pages/settings_subscription/settings_subscription_view.dart b/lib/pangea/pages/settings_subscription/settings_subscription_view.dart index dbcdf4166b..dd9c62ddc6 100644 --- a/lib/pangea/pages/settings_subscription/settings_subscription_view.dart +++ b/lib/pangea/pages/settings_subscription/settings_subscription_view.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/pages/sign_up/signup.dart b/lib/pangea/pages/sign_up/signup.dart index dafe65b70d..16e8c2bdf5 100644 --- a/lib/pangea/pages/sign_up/signup.dart +++ b/lib/pangea/pages/sign_up/signup.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/pages/sign_up/signup_view.dart b/lib/pangea/pages/sign_up/signup_view.dart index 57d65df2f7..ce1e18c0d2 100644 --- a/lib/pangea/pages/sign_up/signup_view.dart +++ b/lib/pangea/pages/sign_up/signup_view.dart @@ -1,11 +1,11 @@ // Flutter imports: -// Project imports: -import 'package:fluffychat/pangea/widgets/signup/tos_checkbox.dart'; -import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; + import 'package:flutter/material.dart'; -// Package imports: + import 'package:flutter_gen/gen_l10n/l10n.dart'; +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 858cf7cac9..295d4389ba 100644 --- a/lib/pangea/repo/class_repo.dart +++ b/lib/pangea/repo/class_repo.dart @@ -1,13 +1,9 @@ -// Dart imports: import 'dart:convert'; -// 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'; diff --git a/lib/pangea/repo/contextualized_translation_repo.dart b/lib/pangea/repo/contextualized_translation_repo.dart index 21aede9fc9..8561cde5a2 100644 --- a/lib/pangea/repo/contextualized_translation_repo.dart +++ b/lib/pangea/repo/contextualized_translation_repo.dart @@ -1,11 +1,8 @@ -// Dart imports: import 'dart:convert'; -// 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'; diff --git a/lib/pangea/repo/exchange_repo.dart b/lib/pangea/repo/exchange_repo.dart index 131dbbeaaf..97bd9ed74f 100644 --- a/lib/pangea/repo/exchange_repo.dart +++ b/lib/pangea/repo/exchange_repo.dart @@ -1,4 +1,3 @@ -// 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 0968eaf942..4be05da579 100644 --- a/lib/pangea/repo/full_text_translation_repo.dart +++ b/lib/pangea/repo/full_text_translation_repo.dart @@ -1,12 +1,9 @@ //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 ead9322e10..9c1948466b 100644 --- a/lib/pangea/repo/igc_repo.dart +++ b/lib/pangea/repo/igc_repo.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/repo/interactive_translation_repo.dart b/lib/pangea/repo/interactive_translation_repo.dart index f68a8e8ecb..bbc556bdc1 100644 --- a/lib/pangea/repo/interactive_translation_repo.dart +++ b/lib/pangea/repo/interactive_translation_repo.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:convert'; -// 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'; diff --git a/lib/pangea/repo/language_repo.dart b/lib/pangea/repo/language_repo.dart index 418fa8e7c1..b74b8a030c 100644 --- a/lib/pangea/repo/language_repo.dart +++ b/lib/pangea/repo/language_repo.dart @@ -1,14 +1,10 @@ -// 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'; diff --git a/lib/pangea/repo/message_service.repo.dart b/lib/pangea/repo/message_service.repo.dart index 40b9ec4d2f..49288de5ec 100644 --- a/lib/pangea/repo/message_service.repo.dart +++ b/lib/pangea/repo/message_service.repo.dart @@ -1,4 +1,3 @@ -// 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 7d2e67ef99..9b3786af83 100644 --- a/lib/pangea/repo/similarity_repo.dart +++ b/lib/pangea/repo/similarity_repo.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:convert'; -// 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 68212a8691..36a43a4a42 100644 --- a/lib/pangea/repo/span_data_repo.dart +++ b/lib/pangea/repo/span_data_repo.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/repo/subscription_repo.dart b/lib/pangea/repo/subscription_repo.dart index 856a60dcc0..20dd45b93c 100644 --- a/lib/pangea/repo/subscription_repo.dart +++ b/lib/pangea/repo/subscription_repo.dart @@ -1,14 +1,10 @@ -// 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'; diff --git a/lib/pangea/repo/tokens_repo.dart b/lib/pangea/repo/tokens_repo.dart index fa8eb0c270..456b8396c7 100644 --- a/lib/pangea/repo/tokens_repo.dart +++ b/lib/pangea/repo/tokens_repo.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:convert'; -// 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'; diff --git a/lib/pangea/repo/topic_data_repo.dart b/lib/pangea/repo/topic_data_repo.dart index ccdd181811..f53514835c 100644 --- a/lib/pangea/repo/topic_data_repo.dart +++ b/lib/pangea/repo/topic_data_repo.dart @@ -1,13 +1,9 @@ -// 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 61fd56b8cd..59fc1850ec 100644 --- a/lib/pangea/repo/user_repo.dart +++ b/lib/pangea/repo/user_repo.dart @@ -1,11 +1,8 @@ -// Dart imports: import 'dart:convert'; import 'dart:developer'; -// 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'; diff --git a/lib/pangea/repo/word_repo.dart b/lib/pangea/repo/word_repo.dart index 13d9db995f..c592eba377 100644 --- a/lib/pangea/repo/word_repo.dart +++ b/lib/pangea/repo/word_repo.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:convert'; -// 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'; diff --git a/lib/pangea/utils/add_to_space.dart b/lib/pangea/utils/add_to_space.dart index bd6fda71b8..92458856c1 100644 --- a/lib/pangea/utils/add_to_space.dart +++ b/lib/pangea/utils/add_to_space.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/utils/any_state_holder.dart b/lib/pangea/utils/any_state_holder.dart index e12bb8203b..c71b77311b 100644 --- a/lib/pangea/utils/any_state_holder.dart +++ b/lib/pangea/utils/any_state_holder.dart @@ -1,13 +1,9 @@ -// 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 4164bfe2b5..72f10fae40 100644 --- a/lib/pangea/utils/archive_space.dart +++ b/lib/pangea/utils/archive_space.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/utils/bot_name.dart b/lib/pangea/utils/bot_name.dart index d400994b8a..dc7c0da8f3 100644 --- a/lib/pangea/utils/bot_name.dart +++ b/lib/pangea/utils/bot_name.dart @@ -1,4 +1,3 @@ -// 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 8531f2be97..8c971b307b 100644 --- a/lib/pangea/utils/bot_style.dart +++ b/lib/pangea/utils/bot_style.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; diff --git a/lib/pangea/utils/chat_list_handle_space_tap.dart b/lib/pangea/utils/chat_list_handle_space_tap.dart index 617e60c99a..4ddb76129c 100644 --- a/lib/pangea/utils/chat_list_handle_space_tap.dart +++ b/lib/pangea/utils/chat_list_handle_space_tap.dart @@ -1,13 +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: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'; diff --git a/lib/pangea/utils/class_chat_power_levels.dart b/lib/pangea/utils/class_chat_power_levels.dart index 0581445d4d..660d7a70d6 100644 --- a/lib/pangea/utils/class_chat_power_levels.dart +++ b/lib/pangea/utils/class_chat_power_levels.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/utils/class_code.dart b/lib/pangea/utils/class_code.dart index a31a84106a..6bd9c97643 100644 --- a/lib/pangea/utils/class_code.dart +++ b/lib/pangea/utils/class_code.dart @@ -1,15 +1,11 @@ -// Dart imports: import 'dart:math'; -// 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'; diff --git a/lib/pangea/utils/delete_room.dart b/lib/pangea/utils/delete_room.dart index e987d2b40d..f8e168779c 100644 --- a/lib/pangea/utils/delete_room.dart +++ b/lib/pangea/utils/delete_room.dart @@ -1,7 +1,5 @@ -// Package imports: import 'package:matrix/matrix.dart'; -// Project imports: import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'error_handler.dart'; diff --git a/lib/pangea/utils/download_chat.dart b/lib/pangea/utils/download_chat.dart index b430eb4716..76f51ac96a 100644 --- a/lib/pangea/utils/download_chat.dart +++ b/lib/pangea/utils/download_chat.dart @@ -1,12 +1,9 @@ -// Dart imports: import 'dart:async'; import 'dart:io'; -// 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'; @@ -18,7 +15,6 @@ 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'; diff --git a/lib/pangea/utils/error_handler.dart b/lib/pangea/utils/error_handler.dart index 870678d584..ac125f3c06 100644 --- a/lib/pangea/utils/error_handler.dart +++ b/lib/pangea/utils/error_handler.dart @@ -1,16 +1,12 @@ -// Dart imports: import 'dart:async'; -// 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 { diff --git a/lib/pangea/utils/find_conversation_partner_dialog.dart b/lib/pangea/utils/find_conversation_partner_dialog.dart index cc38015318..035f091d86 100644 --- a/lib/pangea/utils/find_conversation_partner_dialog.dart +++ b/lib/pangea/utils/find_conversation_partner_dialog.dart @@ -1,11 +1,8 @@ -// 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 154a00e379..57dcdd7fd6 100644 --- a/lib/pangea/utils/firebase_analytics.dart +++ b/lib/pangea/utils/firebase_analytics.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/utils/get_chat_list_item_subtitle.dart b/lib/pangea/utils/get_chat_list_item_subtitle.dart index aecca13d12..a1ce043490 100644 --- a/lib/pangea/utils/get_chat_list_item_subtitle.dart +++ b/lib/pangea/utils/get_chat_list_item_subtitle.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/utils/instructions.dart b/lib/pangea/utils/instructions.dart index 75ee21b241..40253a00d6 100644 --- a/lib/pangea/utils/instructions.dart +++ b/lib/pangea/utils/instructions.dart @@ -1,9 +1,7 @@ -// 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 22058f1a09..cd4ee87dbe 100644 --- a/lib/pangea/utils/join_all_space_chats.dart +++ b/lib/pangea/utils/join_all_space_chats.dart @@ -1,10 +1,7 @@ -// 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 diff --git a/lib/pangea/utils/language_level_copy.dart b/lib/pangea/utils/language_level_copy.dart index 7a18e90805..804f45573b 100644 --- a/lib/pangea/utils/language_level_copy.dart +++ b/lib/pangea/utils/language_level_copy.dart @@ -1,7 +1,5 @@ -// 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 01c3b4b484..884ec3badd 100644 --- a/lib/pangea/utils/lock_room.dart +++ b/lib/pangea/utils/lock_room.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/utils/logout.dart b/lib/pangea/utils/logout.dart index 5dfa26af03..aa4441e138 100644 --- a/lib/pangea/utils/logout.dart +++ b/lib/pangea/utils/logout.dart @@ -1,12 +1,9 @@ -// 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 { diff --git a/lib/pangea/utils/martix.utils.dart b/lib/pangea/utils/martix.utils.dart index eb9f5a6a3b..99e535a1be 100644 --- a/lib/pangea/utils/martix.utils.dart +++ b/lib/pangea/utils/martix.utils.dart @@ -1,4 +1,3 @@ -// 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 a4ad52945e..28080f9b5b 100644 --- a/lib/pangea/utils/match_copy.dart +++ b/lib/pangea/utils/match_copy.dart @@ -1,15 +1,11 @@ -// 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: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'; diff --git a/lib/pangea/utils/overlay.dart b/lib/pangea/utils/overlay.dart index ffda1d906a..5f45251f87 100644 --- a/lib/pangea/utils/overlay.dart +++ b/lib/pangea/utils/overlay.dart @@ -1,12 +1,9 @@ -// Dart imports: import 'dart:developer'; import 'dart:math'; -// 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'; diff --git a/lib/pangea/utils/p_store.dart b/lib/pangea/utils/p_store.dart index 1f7e9ff78a..3f74583d86 100644 --- a/lib/pangea/utils/p_store.dart +++ b/lib/pangea/utils/p_store.dart @@ -1,7 +1,5 @@ -// Package imports: import 'package:get_storage/get_storage.dart'; -// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; class PLocalStore { diff --git a/lib/pangea/utils/password_forgotten.dart b/lib/pangea/utils/password_forgotten.dart index 3b2271173a..67c5fdaec2 100644 --- a/lib/pangea/utils/password_forgotten.dart +++ b/lib/pangea/utils/password_forgotten.dart @@ -1,13 +1,10 @@ -// 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'; diff --git a/lib/pangea/utils/platform_name.dart b/lib/pangea/utils/platform_name.dart index 5823f3d97b..f5b6c1dd44 100644 --- a/lib/pangea/utils/platform_name.dart +++ b/lib/pangea/utils/platform_name.dart @@ -1,7 +1,5 @@ -// 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 fa2ea5ac69..bf1558410c 100644 --- a/lib/pangea/utils/report_message.dart +++ b/lib/pangea/utils/report_message.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/utils/set_class_name.dart b/lib/pangea/utils/set_class_name.dart index f2d73c0f03..ae899a430d 100644 --- a/lib/pangea/utils/set_class_name.dart +++ b/lib/pangea/utils/set_class_name.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/utils/set_class_topic.dart b/lib/pangea/utils/set_class_topic.dart index 5d36b2d650..67610c0cad 100644 --- a/lib/pangea/utils/set_class_topic.dart +++ b/lib/pangea/utils/set_class_topic.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/utils/shared_prefs.dart b/lib/pangea/utils/shared_prefs.dart index f98254c5e4..bb9efd9cc8 100644 --- a/lib/pangea/utils/shared_prefs.dart +++ b/lib/pangea/utils/shared_prefs.dart @@ -1,7 +1,5 @@ -// Dart imports: import 'dart:convert'; -// Package imports: import 'package:shared_preferences/shared_preferences.dart'; class MyShared { diff --git a/lib/pangea/utils/space_navigator.dart b/lib/pangea/utils/space_navigator.dart index 9b05105827..af72a0b250 100644 --- a/lib/pangea/utils/space_navigator.dart +++ b/lib/pangea/utils/space_navigator.dart @@ -1,7 +1,5 @@ -// 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 6aaf432372..20a69d4a20 100644 --- a/lib/pangea/utils/subscription_app_id.dart +++ b/lib/pangea/utils/subscription_app_id.dart @@ -1,7 +1,5 @@ -// 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 bbd657887d..80041a3119 100644 --- a/lib/pangea/utils/sync_status_util.dart +++ b/lib/pangea/utils/sync_status_util.dart @@ -1,14 +1,10 @@ -// 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/utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/pangea/utils/sync_status_util_v2.dart b/lib/pangea/utils/sync_status_util_v2.dart index 06a44a9f4e..51062afa11 100644 --- a/lib/pangea/utils/sync_status_util_v2.dart +++ b/lib/pangea/utils/sync_status_util_v2.dart @@ -1,11 +1,8 @@ -// 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 75ceea9f64..2ce4dbd748 100644 --- a/lib/pangea/widgets/chat/locked_chat_message.dart +++ b/lib/pangea/widgets/chat/locked_chat_message.dart @@ -1,10 +1,7 @@ -// 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 { 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 411769be70..c8984f8d75 100644 --- a/lib/pangea/widgets/chat_list/chat_list_body_text.dart +++ b/lib/pangea/widgets/chat_list/chat_list_body_text.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/widgets/class/add_class_and_invite.dart b/lib/pangea/widgets/class/add_class_and_invite.dart index a9fbd6e63e..498cb61ac0 100644 --- a/lib/pangea/widgets/class/add_class_and_invite.dart +++ b/lib/pangea/widgets/class/add_class_and_invite.dart @@ -1,17 +1,13 @@ -// 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'; -// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import '../../../widgets/matrix.dart'; diff --git a/lib/pangea/widgets/class/add_space_toggles.dart b/lib/pangea/widgets/class/add_space_toggles.dart index ffbebe3936..7409a23558 100644 --- a/lib/pangea/widgets/class/add_space_toggles.dart +++ b/lib/pangea/widgets/class/add_space_toggles.dart @@ -1,16 +1,12 @@ -// Dart imports: import 'dart:math'; -// 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'; diff --git a/lib/pangea/widgets/class/join_with_link.dart b/lib/pangea/widgets/class/join_with_link.dart index 83114fa03f..c513c7b3fd 100644 --- a/lib/pangea/widgets/class/join_with_link.dart +++ b/lib/pangea/widgets/class/join_with_link.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/pangea/widgets/common/aligned_dialog.dart b/lib/pangea/widgets/common/aligned_dialog.dart index 312c3f6341..c085133002 100644 --- a/lib/pangea/widgets/common/aligned_dialog.dart +++ b/lib/pangea/widgets/common/aligned_dialog.dart @@ -1,4 +1,3 @@ -// 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 b35714e7a6..54143626e0 100644 --- a/lib/pangea/widgets/common/bot_face_svg.dart +++ b/lib/pangea/widgets/common/bot_face_svg.dart @@ -1,4 +1,3 @@ -// 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 6c7fa6d6e5..0886967a54 100644 --- a/lib/pangea/widgets/common/list_placeholder.dart +++ b/lib/pangea/widgets/common/list_placeholder.dart @@ -1,4 +1,3 @@ -// 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 1cc927dd56..f292d9b23e 100644 --- a/lib/pangea/widgets/common/p_circular_loader.dart +++ b/lib/pangea/widgets/common/p_circular_loader.dart @@ -1,4 +1,3 @@ -// 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 6a2b3b94f5..a86a7e6e91 100644 --- a/lib/pangea/widgets/common/pangea_logo_svg.dart +++ b/lib/pangea/widgets/common/pangea_logo_svg.dart @@ -1,7 +1,5 @@ -// 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 2f34490e5c..b2a7d56f5e 100644 --- a/lib/pangea/widgets/common/star_rating.dart +++ b/lib/pangea/widgets/common/star_rating.dart @@ -1,4 +1,3 @@ -// 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 7780673e20..4b6067371d 100644 --- a/lib/pangea/widgets/common_widgets/edit_list_tile.dart +++ b/lib/pangea/widgets/common_widgets/edit_list_tile.dart @@ -1,7 +1,5 @@ -// 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 e0a9f28da3..c836dffdbe 100644 --- a/lib/pangea/widgets/common_widgets/overlay_container.dart +++ b/lib/pangea/widgets/common_widgets/overlay_container.dart @@ -1,4 +1,3 @@ -// 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 02dc7692e9..31bab0e587 100644 --- a/lib/pangea/widgets/common_widgets/p_input_field.dart +++ b/lib/pangea/widgets/common_widgets/p_input_field.dart @@ -1,7 +1,5 @@ -// 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 329d52ab85..5d1607e0af 100644 --- a/lib/pangea/widgets/flag.dart +++ b/lib/pangea/widgets/flag.dart @@ -1,7 +1,5 @@ -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/widgets/avatar.dart'; import '../models/language_model.dart'; diff --git a/lib/pangea/widgets/igc/card_error_widget.dart b/lib/pangea/widgets/igc/card_error_widget.dart index d0b3d1f1e5..7826aa8ceb 100644 --- a/lib/pangea/widgets/igc/card_error_widget.dart +++ b/lib/pangea/widgets/igc/card_error_widget.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/widgets/igc/card_header.dart b/lib/pangea/widgets/igc/card_header.dart index c8e52f598a..bfede842c5 100644 --- a/lib/pangea/widgets/igc/card_header.dart +++ b/lib/pangea/widgets/igc/card_header.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/widgets/igc/pangea_rich_text.dart b/lib/pangea/widgets/igc/pangea_rich_text.dart index e9b430fd08..d7af1c238f 100644 --- a/lib/pangea/widgets/igc/pangea_rich_text.dart +++ b/lib/pangea/widgets/igc/pangea_rich_text.dart @@ -1,15 +1,11 @@ -// 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'; diff --git a/lib/pangea/widgets/igc/pangea_text_controller.dart b/lib/pangea/widgets/igc/pangea_text_controller.dart index 3676dcf889..47e120576f 100644 --- a/lib/pangea/widgets/igc/pangea_text_controller.dart +++ b/lib/pangea/widgets/igc/pangea_text_controller.dart @@ -1,11 +1,8 @@ -// Dart imports: import 'dart:developer'; -// 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'; diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 30d8ba9b5f..3213b5296e 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -1,14 +1,10 @@ -// 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'; diff --git a/lib/pangea/widgets/igc/span_data.dart b/lib/pangea/widgets/igc/span_data.dart index 52520beb9c..892c245a14 100644 --- a/lib/pangea/widgets/igc/span_data.dart +++ b/lib/pangea/widgets/igc/span_data.dart @@ -4,10 +4,8 @@ // 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 c584f1f3ab..94f129f092 100644 --- a/lib/pangea/widgets/igc/word_data_card.dart +++ b/lib/pangea/widgets/igc/word_data_card.dart @@ -1,16 +1,12 @@ -// 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'; diff --git a/lib/pangea/widgets/login/home_picker_logo.dart b/lib/pangea/widgets/login/home_picker_logo.dart index 5c8c12b44d..30fc33b24e 100644 --- a/lib/pangea/widgets/login/home_picker_logo.dart +++ b/lib/pangea/widgets/login/home_picker_logo.dart @@ -1,10 +1,7 @@ -// 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 b2bdf6920a..e720b95af9 100644 --- a/lib/pangea/widgets/new_group/topics_list.dart +++ b/lib/pangea/widgets/new_group/topics_list.dart @@ -1,10 +1,7 @@ -// 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 0824c81f6c..9783be7d07 100644 --- a/lib/pangea/widgets/new_group/vocab_list.dart +++ b/lib/pangea/widgets/new_group/vocab_list.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/widgets/signup/signup_buttons.dart b/lib/pangea/widgets/signup/signup_buttons.dart index 25769ac7b9..bd446c0372 100644 --- a/lib/pangea/widgets/signup/signup_buttons.dart +++ b/lib/pangea/widgets/signup/signup_buttons.dart @@ -1,20 +1,18 @@ -// Dart imports: import 'dart:typed_data'; -// Package imports: +import 'package:flutter/material.dart'; + import 'package:adaptive_dialog/adaptive_dialog.dart'; -// Project imports: +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'; + 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'; -// Flutter imports: -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({super.key}); diff --git a/lib/pangea/widgets/signup/tos_checkbox.dart b/lib/pangea/widgets/signup/tos_checkbox.dart index 0627d77cd2..f5bca72c26 100644 --- a/lib/pangea/widgets/signup/tos_checkbox.dart +++ b/lib/pangea/widgets/signup/tos_checkbox.dart @@ -1,11 +1,12 @@ // Flutter imports: -// Project imports: + +import 'package:flutter/material.dart'; + +import 'package:flutter_gen/gen_l10n/l10n.dart'; + 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'; -// Package imports: -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 86066e972e..73db3c8ba3 100644 --- a/lib/pangea/widgets/space/class_settings.dart +++ b/lib/pangea/widgets/space/class_settings.dart @@ -1,16 +1,12 @@ -// 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:matrix/matrix.dart'; -// Project imports: import 'package:fluffychat/pangea/models/class_model.dart'; import '../../../widgets/matrix.dart'; import '../../constants/language_keys.dart'; diff --git a/lib/pangea/widgets/subscription/subscription_buttons.dart b/lib/pangea/widgets/subscription/subscription_buttons.dart index 267233ec7c..ffd4159752 100644 --- a/lib/pangea/widgets/subscription/subscription_buttons.dart +++ b/lib/pangea/widgets/subscription/subscription_buttons.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/widgets/subscription/subscription_options.dart b/lib/pangea/widgets/subscription/subscription_options.dart index 5c33439308..dee683b4df 100644 --- a/lib/pangea/widgets/subscription/subscription_options.dart +++ b/lib/pangea/widgets/subscription/subscription_options.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/widgets/subscription/subscription_paywall.dart b/lib/pangea/widgets/subscription/subscription_paywall.dart index cc97871cc2..949d3238e5 100644 --- a/lib/pangea/widgets/subscription/subscription_paywall.dart +++ b/lib/pangea/widgets/subscription/subscription_paywall.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/widgets/user_settings/country_picker_tile.dart b/lib/pangea/widgets/user_settings/country_picker_tile.dart index bb66c4e85f..455b9cdbb9 100644 --- a/lib/pangea/widgets/user_settings/country_picker_tile.dart +++ b/lib/pangea/widgets/user_settings/country_picker_tile.dart @@ -1,16 +1,12 @@ -// Dart imports: import 'dart:developer'; -// 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'; diff --git a/lib/pangea/widgets/user_settings/language_tile.dart b/lib/pangea/widgets/user_settings/language_tile.dart index 52e5d2efed..331ec90a58 100644 --- a/lib/pangea/widgets/user_settings/language_tile.dart +++ b/lib/pangea/widgets/user_settings/language_tile.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/pangea/widgets/user_settings/p_language_dialog.dart b/lib/pangea/widgets/user_settings/p_language_dialog.dart index 99c5d44fc1..94f20f2f3f 100644 --- a/lib/pangea/widgets/user_settings/p_language_dialog.dart +++ b/lib/pangea/widgets/user_settings/p_language_dialog.dart @@ -1,15 +1,11 @@ -// 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'; -// 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'; diff --git a/lib/pangea/widgets/user_settings/p_language_dropdown.dart b/lib/pangea/widgets/user_settings/p_language_dropdown.dart index 34d661faeb..0694355c55 100644 --- a/lib/pangea/widgets/user_settings/p_language_dropdown.dart +++ b/lib/pangea/widgets/user_settings/p_language_dropdown.dart @@ -1,8 +1,8 @@ // Flutter imports: -// Project imports: -import 'package:fluffychat/pangea/models/language_model.dart'; + import 'package:flutter/material.dart'; +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 b4a8a5e0a4..ac6c484093 100644 --- a/lib/pangea/widgets/user_settings/p_question_container.dart +++ b/lib/pangea/widgets/user_settings/p_question_container.dart @@ -1,4 +1,3 @@ -// 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 0d3b0eb723..047782175c 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,5 @@ -// 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'; diff --git a/lib/pangea/word_cloud/word_cloud_setting.dart b/lib/pangea/word_cloud/word_cloud_setting.dart index aa5ce51cc6..2e0768991c 100644 --- a/lib/pangea/word_cloud/word_cloud_setting.dart +++ b/lib/pangea/word_cloud/word_cloud_setting.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:math'; -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/pangea/word_cloud/word_cloud_shape.dart'; class WordCloudSetting { diff --git a/lib/pangea/word_cloud/word_cloud_tap_view.dart b/lib/pangea/word_cloud/word_cloud_tap_view.dart index bc59f100c4..115ca3a842 100644 --- a/lib/pangea/word_cloud/word_cloud_tap_view.dart +++ b/lib/pangea/word_cloud/word_cloud_tap_view.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/pangea/word_cloud/word_cloud_view.dart b/lib/pangea/word_cloud/word_cloud_view.dart index 869e102582..94458d1fba 100644 --- a/lib/pangea/word_cloud/word_cloud_view.dart +++ b/lib/pangea/word_cloud/word_cloud_view.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/utils/account_bundles.dart b/lib/utils/account_bundles.dart index 336c7202e0..8bd296e053 100644 --- a/lib/utils/account_bundles.dart +++ b/lib/utils/account_bundles.dart @@ -1,4 +1,3 @@ -// 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 5d403e2f6b..d2a9a8b6da 100644 --- a/lib/utils/adaptive_bottom_sheet.dart +++ b/lib/utils/adaptive_bottom_sheet.dart @@ -1,7 +1,5 @@ -// 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'; diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 67f8617c67..2bbcc1f92b 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -17,16 +17,13 @@ * 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'; @@ -37,7 +34,6 @@ 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'; diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index b7204af669..0cc5b0051d 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -1,14 +1,11 @@ -// 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'; diff --git a/lib/utils/custom_http_client.dart b/lib/utils/custom_http_client.dart index 317c66a599..479e5edb5d 100644 --- a/lib/utils/custom_http_client.dart +++ b/lib/utils/custom_http_client.dart @@ -1,12 +1,9 @@ -// 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 4052da94b4..48b803a90e 100644 --- a/lib/utils/custom_image_resizer.dart +++ b/lib/utils/custom_image_resizer.dart @@ -1,8 +1,6 @@ -// 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 cd46cc0558..ba25e95649 100644 --- a/lib/utils/custom_scroll_behaviour.dart +++ b/lib/utils/custom_scroll_behaviour.dart @@ -1,4 +1,3 @@ -// 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 7cc46e766f..121eaf72e7 100644 --- a/lib/utils/date_time_extension.dart +++ b/lib/utils/date_time_extension.dart @@ -1,7 +1,5 @@ -// 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 c6974b9c47..3f8a003d42 100644 --- a/lib/utils/error_reporter.dart +++ b/lib/utils/error_reporter.dart @@ -1,17 +1,13 @@ -// Dart imports: 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: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'; diff --git a/lib/utils/fluffy_share.dart b/lib/utils/fluffy_share.dart index 6499adba57..92f60b1dda 100644 --- a/lib/utils/fluffy_share.dart +++ b/lib/utils/fluffy_share.dart @@ -1,12 +1,9 @@ -// 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'; diff --git a/lib/utils/localized_exception_extension.dart b/lib/utils/localized_exception_extension.dart index 325e0dc39d..d665c7f107 100644 --- a/lib/utils/localized_exception_extension.dart +++ b/lib/utils/localized_exception_extension.dart @@ -1,14 +1,10 @@ -// 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 362e871866..dd11af0f27 100644 --- a/lib/utils/matrix_sdk_extensions/client_stories_extension.dart +++ b/lib/utils/matrix_sdk_extensions/client_stories_extension.dart @@ -1,12 +1,9 @@ -// 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 { diff --git a/lib/utils/matrix_sdk_extensions/device_extension.dart b/lib/utils/matrix_sdk_extensions/device_extension.dart index 180a8c1a76..55f3ebfc9b 100644 --- a/lib/utils/matrix_sdk_extensions/device_extension.dart +++ b/lib/utils/matrix_sdk_extensions/device_extension.dart @@ -1,7 +1,5 @@ -// 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 9bc9258cdf..ddd5abe80b 100644 --- a/lib/utils/matrix_sdk_extensions/event_extension.dart +++ b/lib/utils/matrix_sdk_extensions/event_extension.dart @@ -1,16 +1,12 @@ -// 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 eccc21bed0..7ae2bf0c50 100644 --- a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart +++ b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart @@ -1,7 +1,5 @@ -// 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 138403e743..e930f90c0e 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart @@ -1,12 +1,9 @@ -// 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 c0170c2453..bea7713d08 100644 --- a/lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart +++ b/lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart @@ -1,9 +1,7 @@ -// 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 041b27b3a7..183fb753f3 100644 --- a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart +++ b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:io'; -// 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'; @@ -13,7 +10,6 @@ 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'; diff --git a/lib/utils/matrix_sdk_extensions/matrix_locals.dart b/lib/utils/matrix_sdk_extensions/matrix_locals.dart index 4f3afd1c43..4a9b682747 100644 --- a/lib/utils/matrix_sdk_extensions/matrix_locals.dart +++ b/lib/utils/matrix_sdk_extensions/matrix_locals.dart @@ -1,4 +1,3 @@ -// 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 7218d30b57..bb6e1069ed 100644 --- a/lib/utils/matrix_sdk_extensions/presence_extension.dart +++ b/lib/utils/matrix_sdk_extensions/presence_extension.dart @@ -1,11 +1,8 @@ -// 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 4710ccc118..9094b774be 100644 --- a/lib/utils/platform_infos.dart +++ b/lib/utils/platform_infos.dart @@ -1,17 +1,13 @@ -// 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 265b318bd1..29683f64cf 100644 --- a/lib/utils/push_helper.dart +++ b/lib/utils/push_helper.dart @@ -1,19 +1,15 @@ -// 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'; diff --git a/lib/utils/resize_image.dart b/lib/utils/resize_image.dart index f845c6ba12..3bfe81a6d5 100644 --- a/lib/utils/resize_image.dart +++ b/lib/utils/resize_image.dart @@ -1,12 +1,9 @@ -// 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 2bbeb5311c..3b4e623f77 100644 --- a/lib/utils/room_status_extension.dart +++ b/lib/utils/room_status_extension.dart @@ -1,11 +1,8 @@ -// 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 c37cdf03f7..9006dcc0a5 100644 --- a/lib/utils/story_theme_data.dart +++ b/lib/utils/story_theme_data.dart @@ -1,7 +1,5 @@ -// 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 25f2eb6137..66e840fcee 100644 --- a/lib/utils/stream_extension.dart +++ b/lib/utils/stream_extension.dart @@ -1,4 +1,3 @@ -// Dart imports: import 'dart:async'; extension StreamExtension on Stream { diff --git a/lib/utils/string_color.dart b/lib/utils/string_color.dart index 09421c17b2..b3c251b3a8 100644 --- a/lib/utils/string_color.dart +++ b/lib/utils/string_color.dart @@ -1,4 +1,3 @@ -// 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 22f145191c..04c8b48448 100644 --- a/lib/utils/uia_request_manager.dart +++ b/lib/utils/uia_request_manager.dart @@ -1,13 +1,10 @@ -// Dart imports: import 'dart:async'; -// 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_string.dart'; -// Project imports: import 'package:fluffychat/widgets/matrix.dart'; extension UiaRequestManager on MatrixState { diff --git a/lib/utils/update_checker_no_store.dart b/lib/utils/update_checker_no_store.dart index 1a7301a625..d41bc07f60 100644 --- a/lib/utils/update_checker_no_store.dart +++ b/lib/utils/update_checker_no_store.dart @@ -1,19 +1,15 @@ -// 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 439852f951..808f64f65b 100644 --- a/lib/utils/url_launcher.dart +++ b/lib/utils/url_launcher.dart @@ -1,7 +1,5 @@ -// 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_gen/gen_l10n/l10n.dart'; @@ -11,7 +9,6 @@ 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'; diff --git a/lib/utils/voip/callkeep_manager.dart b/lib/utils/voip/callkeep_manager.dart index 07fb2c6e8a..6de7cb6e3a 100644 --- a/lib/utils/voip/callkeep_manager.dart +++ b/lib/utils/voip/callkeep_manager.dart @@ -1,17 +1,13 @@ -// 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 de19596d8a..874da93ee1 100644 --- a/lib/utils/voip/user_media_manager.dart +++ b/lib/utils/voip/user_media_manager.dart @@ -1,11 +1,8 @@ -// 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 785f1ece01..4626c1c496 100644 --- a/lib/utils/voip_plugin.dart +++ b/lib/utils/voip_plugin.dart @@ -1,17 +1,13 @@ -// Dart imports: import 'dart:core'; -// 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'; diff --git a/lib/widgets/adaptive_flat_button.dart b/lib/widgets/adaptive_flat_button.dart index c525e88132..faed7e9510 100644 --- a/lib/widgets/adaptive_flat_button.dart +++ b/lib/widgets/adaptive_flat_button.dart @@ -1,8 +1,6 @@ -// 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 f39401545c..ace02b2276 100644 --- a/lib/widgets/app_lock.dart +++ b/lib/widgets/app_lock.dart @@ -1,12 +1,9 @@ -// 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 a5de362751..9b19e5613c 100644 --- a/lib/widgets/avatar.dart +++ b/lib/widgets/avatar.dart @@ -1,10 +1,7 @@ -// 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'; diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart index 077cf006f8..d89f603531 100644 --- a/lib/widgets/chat_settings_popup_menu.dart +++ b/lib/widgets/chat_settings_popup_menu.dart @@ -1,11 +1,8 @@ -// 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:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; @@ -13,7 +10,6 @@ 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'; diff --git a/lib/widgets/connection_status_header.dart b/lib/widgets/connection_status_header.dart index a3d1755e7a..2283c41bf4 100644 --- a/lib/widgets/connection_status_header.dart +++ b/lib/widgets/connection_status_header.dart @@ -1,14 +1,10 @@ -// 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 6fb10d13c8..f9e6a61676 100644 --- a/lib/widgets/content_banner.dart +++ b/lib/widgets/content_banner.dart @@ -1,10 +1,7 @@ -// 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 cb80cf3642..8606c7608e 100644 --- a/lib/widgets/error_widget.dart +++ b/lib/widgets/error_widget.dart @@ -1,7 +1,5 @@ -// 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 18892a21be..3804a91813 100644 --- a/lib/widgets/fluffy_chat_app.dart +++ b/lib/widgets/fluffy_chat_app.dart @@ -1,7 +1,5 @@ -// 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'; @@ -9,7 +7,6 @@ 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'; diff --git a/lib/widgets/hover_builder.dart b/lib/widgets/hover_builder.dart index 9ce3eae200..f895d85322 100644 --- a/lib/widgets/hover_builder.dart +++ b/lib/widgets/hover_builder.dart @@ -1,4 +1,3 @@ -// 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 f6faaeb525..1a6b42e70e 100644 --- a/lib/widgets/layouts/empty_page.dart +++ b/lib/widgets/layouts/empty_page.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:math'; -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart'; class EmptyPage extends StatelessWidget { diff --git a/lib/widgets/layouts/login_scaffold.dart b/lib/widgets/layouts/login_scaffold.dart index 508d4949dc..6123ddf39b 100644 --- a/lib/widgets/layouts/login_scaffold.dart +++ b/lib/widgets/layouts/login_scaffold.dart @@ -1,11 +1,8 @@ -// 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'; diff --git a/lib/widgets/layouts/max_width_body.dart b/lib/widgets/layouts/max_width_body.dart index 0f6ce49c6e..a5d9cafe0e 100644 --- a/lib/widgets/layouts/max_width_body.dart +++ b/lib/widgets/layouts/max_width_body.dart @@ -1,10 +1,7 @@ -// Dart imports: import 'dart:math'; -// Flutter imports: import 'package:flutter/material.dart'; -// Project imports: import 'package:fluffychat/config/app_config.dart'; class MaxWidthBody extends StatelessWidget { diff --git a/lib/widgets/layouts/two_column_layout.dart b/lib/widgets/layouts/two_column_layout.dart index 81bc10a95f..a6f4c8bdf6 100644 --- a/lib/widgets/layouts/two_column_layout.dart +++ b/lib/widgets/layouts/two_column_layout.dart @@ -1,4 +1,3 @@ -// 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 25b3c51c13..44754030cc 100644 --- a/lib/widgets/local_notifications_extension.dart +++ b/lib/widgets/local_notifications_extension.dart @@ -1,10 +1,7 @@ -// 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:flutter_gen/gen_l10n/l10n.dart'; @@ -14,7 +11,6 @@ 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'; diff --git a/lib/widgets/lock_screen.dart b/lib/widgets/lock_screen.dart index 3075af4197..8825f6cd8c 100644 --- a/lib/widgets/lock_screen.dart +++ b/lib/widgets/lock_screen.dart @@ -1,13 +1,9 @@ -// 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'; diff --git a/lib/widgets/log_view.dart b/lib/widgets/log_view.dart index a24e92f8f3..6e5e318828 100644 --- a/lib/widgets/log_view.dart +++ b/lib/widgets/log_view.dart @@ -1,7 +1,5 @@ -// 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 f2202d2343..eb80a052fa 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -1,13 +1,10 @@ -// 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'; @@ -22,7 +19,6 @@ 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'; diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart index 789571f6fa..0aedd1e4ff 100644 --- a/lib/widgets/mxc_image.dart +++ b/lib/widgets/mxc_image.dart @@ -1,14 +1,10 @@ -// 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 5444bfb954..cc6e9303e0 100644 --- a/lib/widgets/permission_slider_dialog.dart +++ b/lib/widgets/permission_slider_dialog.dart @@ -1,8 +1,6 @@ -// 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'; diff --git a/lib/widgets/presence_builder.dart b/lib/widgets/presence_builder.dart index bd37ae0818..223fe0cc78 100644 --- a/lib/widgets/presence_builder.dart +++ b/lib/widgets/presence_builder.dart @@ -1,10 +1,7 @@ -// 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 c720d241f7..1cfee20863 100644 --- a/lib/widgets/profile_bottom_sheet.dart +++ b/lib/widgets/profile_bottom_sheet.dart @@ -1,13 +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:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -// Project imports: import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/widgets/public_room_bottom_sheet.dart b/lib/widgets/public_room_bottom_sheet.dart index c72792a64a..cfe21c5e3c 100644 --- a/lib/widgets/public_room_bottom_sheet.dart +++ b/lib/widgets/public_room_bottom_sheet.dart @@ -1,14 +1,11 @@ -// 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'; diff --git a/lib/widgets/settings_switch_list_tile.dart b/lib/widgets/settings_switch_list_tile.dart index 6a175f599f..8f4285a4be 100644 --- a/lib/widgets/settings_switch_list_tile.dart +++ b/lib/widgets/settings_switch_list_tile.dart @@ -1,7 +1,5 @@ -// 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 8ad6a0824e..b35a0b4495 100644 --- a/lib/widgets/theme_builder.dart +++ b/lib/widgets/theme_builder.dart @@ -1,7 +1,5 @@ -// 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 1d12ced187..72f14b76ca 100644 --- a/lib/widgets/unread_rooms_badge.dart +++ b/lib/widgets/unread_rooms_badge.dart @@ -1,11 +1,8 @@ -// 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 01975a49d7..25bb090e78 100644 --- a/test/archive_test.dart +++ b/test/archive_test.dart @@ -1,4 +1,3 @@ -// 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 f8062dcef3..e56f060524 100644 --- a/test/command_hint_test.dart +++ b/test/command_hint_test.dart @@ -1,11 +1,8 @@ -// 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 d44497df26..054f49cab0 100644 --- a/test/homeserver_picker_test.dart +++ b/test/homeserver_picker_test.dart @@ -1,7 +1,6 @@ //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 cb9c9172ce..55fccd03f0 100644 --- a/test/utils/test_client.dart +++ b/test/utils/test_client.dart @@ -1,11 +1,9 @@ // 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 399376b23d..7d1d98eb6e 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -7,7 +7,6 @@ //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 ab5f47188e..b38629cca9 100644 --- a/test_driver/integration_test.dart +++ b/test_driver/integration_test.dart @@ -1,4 +1,3 @@ -// Package imports: import 'package:integration_test/integration_test_driver.dart'; Future main() => integrationDriver();