From 3afd97fe0701f27071a27738daa5b3e4ef62dd2e Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 6 Nov 2025 13:23:45 -0500 Subject: [PATCH] formatting --- lib/pages/chat/input_bar.dart | 15 ++++++++------- .../widgets/chat_floating_action_button.dart | 3 ++- lib/pangea/chat/widgets/chat_input_bar.dart | 3 ++- .../chat/widgets/pangea_chat_input_row.dart | 4 +++- .../choreographer/assistance_state_enum.dart | 3 ++- .../choreographer/choreo_record_model.dart | 1 - .../choreographer_has_error_button.dart | 2 +- .../choreographer_send_button.dart | 3 ++- .../choreographer/igc/autocorrect_span.dart | 5 +++-- .../choreographer/igc/igc_controller.dart | 1 + lib/pangea/choreographer/igc/igc_repo.dart | 7 ++++--- .../igc/igc_text_data_model.dart | 4 +++- .../choreographer/igc/pangea_match_model.dart | 1 - lib/pangea/choreographer/igc/span_card.dart | 7 ++++--- .../igc/span_choice_type_enum.dart | 3 ++- .../choreographer/igc/span_data_model.dart | 7 ++++--- .../choreographer/igc/span_data_repo.dart | 4 ++-- .../it/completed_it_step_model.dart | 2 +- .../it/contextual_definition_repo.dart | 4 ++-- lib/pangea/choreographer/it/it_bar.dart | 7 ++++--- .../choreographer/it/it_controller.dart | 5 +++-- .../choreographer/it/it_feedback_card.dart | 5 +++-- .../choreographer/it/it_request_model.dart | 3 ++- .../choreographer/it/it_response_model.dart | 4 +++- .../choreographer/it/word_data_card.dart | 4 +++- .../text_editing/pangea_text_controller.dart | 7 ++++--- lib/pangea/common/utils/overlay.dart | 6 +++--- lib/pangea/common/widgets/card_header.dart | 4 ++-- lib/pangea/common/widgets/choice_array.dart | 5 +++-- .../controllers/message_data_controller.dart | 3 ++- .../event_wrappers/pangea_choreo_event.dart | 7 ++++--- .../event_wrappers/pangea_message_event.dart | 9 +++++---- .../pangea_representation_event.dart | 10 ++++++---- .../extensions/pangea_event_extension.dart | 6 ++++-- .../models/representation_content_model.dart | 3 ++- .../extensions/pangea_room_extension.dart | 15 ++++++++------- .../widgets/language_mismatch_popup.dart | 3 ++- .../subscription/widgets/paywall_card.dart | 3 ++- .../toolbar/controllers/tts_controller.dart | 19 +++++++++++-------- .../message_morph_choice.dart | 4 +++- .../practice_match_card.dart | 6 ++++-- .../multiple_choice_activity.dart | 5 +++-- .../practice_activity_card.dart | 5 +++-- .../full_text_translation_repo.dart | 4 ++-- test/pangea/choreo_record_test.dart | 3 ++- 45 files changed, 139 insertions(+), 95 deletions(-) diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart index 2426e02c5..19a9e57e5 100644 --- a/lib/pages/chat/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -1,4 +1,12 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + import 'package:emojis/emoji.dart'; +import 'package:flutter_typeahead/flutter_typeahead.dart'; +import 'package:matrix/matrix.dart'; +import 'package:slugify/slugify.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/choreographer/choreographer_state_extension.dart'; import 'package:fluffychat/pangea/choreographer/choreographer_ui_extension.dart'; @@ -8,13 +16,6 @@ import 'package:fluffychat/pangea/subscription/widgets/paywall_card.dart'; import 'package:fluffychat/pangea/toolbar/utils/shrinkable_text.dart'; import 'package:fluffychat/utils/markdown_context_builder.dart'; import 'package:fluffychat/widgets/mxc_image.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_typeahead/flutter_typeahead.dart'; -import 'package:matrix/matrix.dart'; -import 'package:slugify/slugify.dart'; - import '../../widgets/avatar.dart'; import '../../widgets/matrix.dart'; import 'command_hints.dart'; diff --git a/lib/pangea/chat/widgets/chat_floating_action_button.dart b/lib/pangea/chat/widgets/chat_floating_action_button.dart index 81b4e1f8d..50d0e29fd 100644 --- a/lib/pangea/chat/widgets/chat_floating_action_button.dart +++ b/lib/pangea/chat/widgets/chat_floating_action_button.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pangea/choreographer/choreographer_has_error_button.dart'; -import 'package:flutter/material.dart'; class ChatFloatingActionButton extends StatelessWidget { final ChatController controller; diff --git a/lib/pangea/chat/widgets/chat_input_bar.dart b/lib/pangea/chat/widgets/chat_input_bar.dart index e99b67764..72250651c 100644 --- a/lib/pangea/chat/widgets/chat_input_bar.dart +++ b/lib/pangea/chat/widgets/chat_input_bar.dart @@ -1,10 +1,11 @@ +import 'package:flutter/material.dart'; + import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/chat/chat_emoji_picker.dart'; import 'package:fluffychat/pages/chat/reply_display.dart'; import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart'; import 'package:fluffychat/pangea/chat/widgets/pangea_chat_input_row.dart'; import 'package:fluffychat/pangea/choreographer/it/it_bar.dart'; -import 'package:flutter/material.dart'; class ChatInputBar extends StatelessWidget { final ChatController controller; diff --git a/lib/pangea/chat/widgets/pangea_chat_input_row.dart b/lib/pangea/chat/widgets/pangea_chat_input_row.dart index 66897cfe5..80602bc28 100644 --- a/lib/pangea/chat/widgets/pangea_chat_input_row.dart +++ b/lib/pangea/chat/widgets/pangea_chat_input_row.dart @@ -1,4 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:animations/animations.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/l10n/l10n.dart'; @@ -10,7 +13,6 @@ import 'package:fluffychat/pangea/choreographer/igc/start_igc_button.dart'; import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; import 'package:fluffychat/pangea/learning_settings/models/language_model.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:flutter/material.dart'; class PangeaChatInputRow extends StatelessWidget { final ChatController controller; diff --git a/lib/pangea/choreographer/assistance_state_enum.dart b/lib/pangea/choreographer/assistance_state_enum.dart index be02d5b6f..b5a0d6412 100644 --- a/lib/pangea/choreographer/assistance_state_enum.dart +++ b/lib/pangea/choreographer/assistance_state_enum.dart @@ -2,9 +2,10 @@ // IGC is running, IGC has run and there are remaining steps (either IT or IGC), or all steps are done // Or user does not have a subscription -import 'package:fluffychat/config/app_config.dart'; import 'package:flutter/material.dart'; +import 'package:fluffychat/config/app_config.dart'; + enum AssistanceStateEnum { noSub, noMessage, diff --git a/lib/pangea/choreographer/choreo_record_model.dart b/lib/pangea/choreographer/choreo_record_model.dart index bff8f5174..557a173b1 100644 --- a/lib/pangea/choreographer/choreo_record_model.dart +++ b/lib/pangea/choreographer/choreo_record_model.dart @@ -4,7 +4,6 @@ import 'package:fluffychat/pangea/choreographer/choreo_edit_model.dart'; import 'package:fluffychat/pangea/choreographer/igc/pangea_match_model.dart'; import 'package:fluffychat/pangea/choreographer/igc/pangea_match_status_enum.dart'; import 'package:fluffychat/pangea/choreographer/igc/span_data_model.dart'; - import 'it/completed_it_step_model.dart'; /// this class lives within a [PangeaIGCEvent] diff --git a/lib/pangea/choreographer/choreographer_has_error_button.dart b/lib/pangea/choreographer/choreographer_has_error_button.dart index be0d3e9fe..b90a52fed 100644 --- a/lib/pangea/choreographer/choreographer_has_error_button.dart +++ b/lib/pangea/choreographer/choreographer_has_error_button.dart @@ -1,6 +1,6 @@ -import 'package:fluffychat/pangea/choreographer/choreographer.dart'; import 'package:flutter/material.dart'; +import 'package:fluffychat/pangea/choreographer/choreographer.dart'; import 'choreographer_error_controller.dart'; class ChoreographerHasErrorButton extends StatelessWidget { diff --git a/lib/pangea/choreographer/choreographer_send_button.dart b/lib/pangea/choreographer/choreographer_send_button.dart index 6a9a07fc2..98755b588 100644 --- a/lib/pangea/choreographer/choreographer_send_button.dart +++ b/lib/pangea/choreographer/choreographer_send_button.dart @@ -1,8 +1,9 @@ +import 'package:flutter/material.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pangea/choreographer/assistance_state_enum.dart'; import 'package:fluffychat/pangea/choreographer/choreographer_state_extension.dart'; -import 'package:flutter/material.dart'; class ChoreographerSendButton extends StatelessWidget { final ChatController controller; diff --git a/lib/pangea/choreographer/igc/autocorrect_span.dart b/lib/pangea/choreographer/igc/autocorrect_span.dart index 937033c41..5517172d1 100644 --- a/lib/pangea/choreographer/igc/autocorrect_span.dart +++ b/lib/pangea/choreographer/igc/autocorrect_span.dart @@ -1,8 +1,9 @@ +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; + import 'package:fluffychat/pangea/choreographer/igc/autocorrect_popup.dart'; import 'package:fluffychat/pangea/common/utils/overlay.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; class AutocorrectSpan extends WidgetSpan { AutocorrectSpan({ diff --git a/lib/pangea/choreographer/igc/igc_controller.dart b/lib/pangea/choreographer/igc/igc_controller.dart index 8f935a20a..c02d858fc 100644 --- a/lib/pangea/choreographer/igc/igc_controller.dart +++ b/lib/pangea/choreographer/igc/igc_controller.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:async/async.dart'; + import 'package:fluffychat/pangea/choreographer/igc/igc_repo.dart'; import 'package:fluffychat/pangea/choreographer/igc/igc_request_model.dart'; import 'package:fluffychat/pangea/choreographer/igc/igc_text_data_model.dart'; diff --git a/lib/pangea/choreographer/igc/igc_repo.dart b/lib/pangea/choreographer/igc/igc_repo.dart index acc30a65d..3ffbc5d07 100644 --- a/lib/pangea/choreographer/igc/igc_repo.dart +++ b/lib/pangea/choreographer/igc/igc_repo.dart @@ -1,14 +1,15 @@ import 'dart:convert'; +import 'package:flutter/material.dart'; + import 'package:async/async.dart'; +import 'package:http/http.dart'; + import 'package:fluffychat/pangea/choreographer/igc/igc_request_model.dart'; import 'package:fluffychat/pangea/choreographer/igc/igc_response_model.dart'; import 'package:fluffychat/pangea/choreographer/igc/pangea_match_model.dart'; import 'package:fluffychat/pangea/common/config/environment.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart'; - import '../../common/network/requests.dart'; import '../../common/network/urls.dart'; diff --git a/lib/pangea/choreographer/igc/igc_text_data_model.dart b/lib/pangea/choreographer/igc/igc_text_data_model.dart index 4b559bb20..52352f951 100644 --- a/lib/pangea/choreographer/igc/igc_text_data_model.dart +++ b/lib/pangea/choreographer/igc/igc_text_data_model.dart @@ -1,11 +1,13 @@ +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; + import 'package:fluffychat/pangea/choreographer/igc/igc_repo.dart'; import 'package:fluffychat/pangea/choreographer/igc/pangea_match_model.dart'; import 'package:fluffychat/pangea/choreographer/igc/pangea_match_state_model.dart'; import 'package:fluffychat/pangea/choreographer/igc/pangea_match_status_enum.dart'; import 'package:fluffychat/pangea/choreographer/igc/span_data_model.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; /// A model representing mutable text and match state used by /// Interactive Grammar Correction (IGC). diff --git a/lib/pangea/choreographer/igc/pangea_match_model.dart b/lib/pangea/choreographer/igc/pangea_match_model.dart index 4a6409fd2..a2db081f8 100644 --- a/lib/pangea/choreographer/igc/pangea_match_model.dart +++ b/lib/pangea/choreographer/igc/pangea_match_model.dart @@ -1,6 +1,5 @@ import 'package:fluffychat/pangea/choreographer/igc/pangea_match_status_enum.dart'; import 'package:fluffychat/pangea/choreographer/igc/span_data_type_enum.dart'; - import 'match_rule_id_model.dart'; import 'span_data_model.dart'; diff --git a/lib/pangea/choreographer/igc/span_card.dart b/lib/pangea/choreographer/igc/span_card.dart index bd03737e6..7ad6b0f16 100644 --- a/lib/pangea/choreographer/igc/span_card.dart +++ b/lib/pangea/choreographer/igc/span_card.dart @@ -1,4 +1,8 @@ +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; import 'package:fluffychat/pangea/choreographer/choreographer.dart'; @@ -9,9 +13,6 @@ import 'package:fluffychat/pangea/choreographer/igc/span_data_type_enum.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/common/utils/feedback_model.dart'; import 'package:fluffychat/pangea/common/widgets/error_indicator.dart'; -import 'package:flutter/material.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../../widgets/matrix.dart'; import '../../common/widgets/choice_array.dart'; import 'why_button.dart'; diff --git a/lib/pangea/choreographer/igc/span_choice_type_enum.dart b/lib/pangea/choreographer/igc/span_choice_type_enum.dart index b866322c0..af8dccb32 100644 --- a/lib/pangea/choreographer/igc/span_choice_type_enum.dart +++ b/lib/pangea/choreographer/igc/span_choice_type_enum.dart @@ -1,6 +1,7 @@ -import 'package:fluffychat/l10n/l10n.dart'; import 'package:flutter/material.dart'; +import 'package:fluffychat/l10n/l10n.dart'; + enum SpanChoiceTypeEnum { bestCorrection, distractor, diff --git a/lib/pangea/choreographer/igc/span_data_model.dart b/lib/pangea/choreographer/igc/span_data_model.dart index 649d0fd82..c778c7907 100644 --- a/lib/pangea/choreographer/igc/span_data_model.dart +++ b/lib/pangea/choreographer/igc/span_data_model.dart @@ -1,8 +1,9 @@ -import 'package:collection/collection.dart'; -import 'package:diacritic/diacritic.dart'; -import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:flutter/material.dart'; +import 'package:collection/collection.dart'; +import 'package:diacritic/diacritic.dart'; + +import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'span_choice_type_enum.dart'; import 'span_data_type_enum.dart'; diff --git a/lib/pangea/choreographer/igc/span_data_repo.dart b/lib/pangea/choreographer/igc/span_data_repo.dart index d9fbe41f6..2f536d5a4 100644 --- a/lib/pangea/choreographer/igc/span_data_repo.dart +++ b/lib/pangea/choreographer/igc/span_data_repo.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:async/async.dart'; +import 'package:http/http.dart'; + import 'package:fluffychat/pangea/choreographer/igc/span_data_request.dart'; import 'package:fluffychat/pangea/choreographer/igc/span_data_response.dart'; import 'package:fluffychat/pangea/common/config/environment.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:http/http.dart'; - import '../../common/network/requests.dart'; import '../../common/network/urls.dart'; diff --git a/lib/pangea/choreographer/it/completed_it_step_model.dart b/lib/pangea/choreographer/it/completed_it_step_model.dart index 23b15e8c5..e1af2afff 100644 --- a/lib/pangea/choreographer/it/completed_it_step_model.dart +++ b/lib/pangea/choreographer/it/completed_it_step_model.dart @@ -1,6 +1,6 @@ -import 'package:fluffychat/l10n/l10n.dart'; import 'package:flutter/material.dart'; +import 'package:fluffychat/l10n/l10n.dart'; import '../choreo_constants.dart'; class CompletedITStepModel { diff --git a/lib/pangea/choreographer/it/contextual_definition_repo.dart b/lib/pangea/choreographer/it/contextual_definition_repo.dart index 1b1c207cf..c1a7a67e7 100644 --- a/lib/pangea/choreographer/it/contextual_definition_repo.dart +++ b/lib/pangea/choreographer/it/contextual_definition_repo.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:async/async.dart'; +import 'package:http/http.dart'; + import 'package:fluffychat/pangea/choreographer/it/contextual_definition_request_model.dart'; import 'package:fluffychat/pangea/choreographer/it/contextual_definition_response_model.dart'; import 'package:fluffychat/pangea/common/config/environment.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; -import 'package:http/http.dart'; - import '../../common/network/requests.dart'; import '../../common/network/urls.dart'; diff --git a/lib/pangea/choreographer/it/it_bar.dart b/lib/pangea/choreographer/it/it_bar.dart index 134749d8e..583789cef 100644 --- a/lib/pangea/choreographer/it/it_bar.dart +++ b/lib/pangea/choreographer/it/it_bar.dart @@ -1,5 +1,9 @@ import 'dart:async'; +import 'package:flutter/material.dart'; + +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/choreographer/choregrapher_user_settings_extension.dart'; import 'package:fluffychat/pangea/choreographer/choreo_constants.dart'; @@ -15,9 +19,6 @@ import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart' import 'package:fluffychat/pangea/learning_settings/pages/settings_learning.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_request_model.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../common/utils/overlay.dart'; import '../../common/widgets/choice_array.dart'; diff --git a/lib/pangea/choreographer/it/it_controller.dart b/lib/pangea/choreographer/it/it_controller.dart index 911817d3b..da55ebb02 100644 --- a/lib/pangea/choreographer/it/it_controller.dart +++ b/lib/pangea/choreographer/it/it_controller.dart @@ -1,15 +1,16 @@ import 'dart:async'; import 'dart:collection'; +import 'package:flutter/foundation.dart'; + import 'package:async/async.dart'; + import 'package:fluffychat/pangea/choreographer/it/gold_route_tracker_model.dart'; import 'package:fluffychat/pangea/choreographer/it/it_repo.dart'; import 'package:fluffychat/pangea/choreographer/it/it_response_model.dart'; import 'package:fluffychat/pangea/choreographer/it/it_step_model.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; - import 'completed_it_step_model.dart'; import 'it_request_model.dart'; diff --git a/lib/pangea/choreographer/it/it_feedback_card.dart b/lib/pangea/choreographer/it/it_feedback_card.dart index e85d0ede5..6cb9ffecd 100644 --- a/lib/pangea/choreographer/it/it_feedback_card.dart +++ b/lib/pangea/choreographer/it/it_feedback_card.dart @@ -1,14 +1,15 @@ import 'dart:math'; +import 'package:flutter/material.dart'; + import 'package:async/async.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/analytics_misc/text_loading_shimmer.dart'; import 'package:fluffychat/pangea/common/utils/feedback_model.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_repo.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_request_model.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:flutter/material.dart'; - import '../../../widgets/matrix.dart'; import '../../bot/utils/bot_style.dart'; import '../../common/widgets/card_error_widget.dart'; diff --git a/lib/pangea/choreographer/it/it_request_model.dart b/lib/pangea/choreographer/it/it_request_model.dart index e6eaabd05..2420947de 100644 --- a/lib/pangea/choreographer/it/it_request_model.dart +++ b/lib/pangea/choreographer/it/it_request_model.dart @@ -1,6 +1,7 @@ +import 'package:flutter/foundation.dart'; + import 'package:fluffychat/pangea/choreographer/it/completed_it_step_model.dart'; import 'package:fluffychat/pangea/common/constants/model_keys.dart'; -import 'package:flutter/foundation.dart'; class ITRequestModel { final String text; diff --git a/lib/pangea/choreographer/it/it_response_model.dart b/lib/pangea/choreographer/it/it_response_model.dart index ebd3b3883..3c68802a8 100644 --- a/lib/pangea/choreographer/it/it_response_model.dart +++ b/lib/pangea/choreographer/it/it_response_model.dart @@ -1,7 +1,9 @@ +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; + import 'package:fluffychat/pangea/choreographer/choreo_constants.dart'; import 'package:fluffychat/pangea/choreographer/it/completed_it_step_model.dart'; -import 'package:flutter/material.dart'; class ITResponseModel { final String fullTextTranslation; diff --git a/lib/pangea/choreographer/it/word_data_card.dart b/lib/pangea/choreographer/it/word_data_card.dart index b28e915b5..942aef97e 100644 --- a/lib/pangea/choreographer/it/word_data_card.dart +++ b/lib/pangea/choreographer/it/word_data_card.dart @@ -1,4 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:async/async.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; @@ -9,7 +12,6 @@ import 'package:fluffychat/pangea/learning_settings/constants/language_constants import 'package:fluffychat/pangea/toolbar/widgets/toolbar_content_loading_indicator.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; class WordDataCard extends StatefulWidget { final String word; diff --git a/lib/pangea/choreographer/text_editing/pangea_text_controller.dart b/lib/pangea/choreographer/text_editing/pangea_text_controller.dart index 91dffa94a..a07665066 100644 --- a/lib/pangea/choreographer/text_editing/pangea_text_controller.dart +++ b/lib/pangea/choreographer/text_editing/pangea_text_controller.dart @@ -1,3 +1,7 @@ +import 'package:flutter/material.dart'; + +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/pangea/choreographer/choreo_constants.dart'; import 'package:fluffychat/pangea/choreographer/igc/autocorrect_span.dart'; import 'package:fluffychat/pangea/choreographer/igc/match_rule_id_model.dart'; @@ -7,9 +11,6 @@ import 'package:fluffychat/pangea/choreographer/igc/pangea_match_status_enum.dar import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/subscription/controllers/subscription_controller.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../choreographer.dart'; import 'edit_type_enum.dart'; diff --git a/lib/pangea/common/utils/overlay.dart b/lib/pangea/common/utils/overlay.dart index 8e4f08b80..82f8fb38c 100644 --- a/lib/pangea/common/utils/overlay.dart +++ b/lib/pangea/common/utils/overlay.dart @@ -1,5 +1,8 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:fluffychat/pangea/choreographer/choreographer.dart'; import 'package:fluffychat/pangea/choreographer/choreographer_ui_extension.dart'; import 'package:fluffychat/pangea/choreographer/igc/pangea_match_state_model.dart'; @@ -8,9 +11,6 @@ import 'package:fluffychat/pangea/common/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/common/widgets/anchored_overlay_widget.dart'; import 'package:fluffychat/pangea/common/widgets/overlay_container.dart'; import 'package:fluffychat/pangea/common/widgets/transparent_backdrop.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - import '../../../config/themes.dart'; import '../../../widgets/matrix.dart'; import 'error_handler.dart'; diff --git a/lib/pangea/common/widgets/card_header.dart b/lib/pangea/common/widgets/card_header.dart index 4513076a5..3999c0a40 100644 --- a/lib/pangea/common/widgets/card_header.dart +++ b/lib/pangea/common/widgets/card_header.dart @@ -1,7 +1,7 @@ -import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; -import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; +import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../bot/widgets/bot_face_svg.dart'; class CardHeader extends StatelessWidget { diff --git a/lib/pangea/common/widgets/choice_array.dart b/lib/pangea/common/widgets/choice_array.dart index 706cf77e1..3a953f0e6 100644 --- a/lib/pangea/common/widgets/choice_array.dart +++ b/lib/pangea/common/widgets/choice_array.dart @@ -1,11 +1,12 @@ +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/common/widgets/choice_animation.dart'; import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; - import '../../bot/utils/bot_style.dart'; import '../../choreographer/it/it_shimmer.dart'; diff --git a/lib/pangea/events/controllers/message_data_controller.dart b/lib/pangea/events/controllers/message_data_controller.dart index 98e8c3b60..ced9bb675 100644 --- a/lib/pangea/events/controllers/message_data_controller.dart +++ b/lib/pangea/events/controllers/message_data_controller.dart @@ -1,6 +1,8 @@ import 'dart:async'; import 'package:async/async.dart'; +import 'package:matrix/matrix.dart' hide Result; + import 'package:fluffychat/pangea/common/controllers/base_controller.dart'; import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; @@ -16,7 +18,6 @@ import 'package:fluffychat/pangea/translation/full_text_translation_repo.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_request_model.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:matrix/matrix.dart' hide Result; // TODO - make this static and take it out of the _pangeaController // will need to pass accessToken to the requests diff --git a/lib/pangea/events/event_wrappers/pangea_choreo_event.dart b/lib/pangea/events/event_wrappers/pangea_choreo_event.dart index 88c28b21a..cd661c0c4 100644 --- a/lib/pangea/events/event_wrappers/pangea_choreo_event.dart +++ b/lib/pangea/events/event_wrappers/pangea_choreo_event.dart @@ -1,10 +1,11 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; + +import 'package:matrix/matrix.dart'; + import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/events/extensions/pangea_event_extension.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; - import '../../choreographer/choreo_record_model.dart'; import '../constants/pangea_event_types.dart'; diff --git a/lib/pangea/events/event_wrappers/pangea_message_event.dart b/lib/pangea/events/event_wrappers/pangea_message_event.dart index 252c916c6..dbaa4ef6d 100644 --- a/lib/pangea/events/event_wrappers/pangea_message_event.dart +++ b/lib/pangea/events/event_wrappers/pangea_message_event.dart @@ -2,7 +2,12 @@ import 'dart:convert'; import 'dart:developer'; import 'dart:ui'; +import 'package:flutter/foundation.dart'; + import 'package:collection/collection.dart'; +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/pangea/choreographer/choreo_record_model.dart'; import 'package:fluffychat/pangea/common/constants/model_keys.dart'; import 'package:fluffychat/pangea/events/event_wrappers/pangea_representation_event.dart'; @@ -24,10 +29,6 @@ import 'package:fluffychat/pangea/toolbar/models/speech_to_text_models.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_audio_card.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_request_model.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../../widgets/matrix.dart'; import '../../common/utils/error_handler.dart'; import '../../learning_settings/constants/language_constants.dart'; diff --git a/lib/pangea/events/event_wrappers/pangea_representation_event.dart b/lib/pangea/events/event_wrappers/pangea_representation_event.dart index b730c9891..ad040438a 100644 --- a/lib/pangea/events/event_wrappers/pangea_representation_event.dart +++ b/lib/pangea/events/event_wrappers/pangea_representation_event.dart @@ -2,8 +2,14 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; + import 'package:async/async.dart'; import 'package:collection/collection.dart'; +import 'package:matrix/matrix.dart' hide Result; +import 'package:matrix/src/utils/markdown.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart'; import 'package:fluffychat/pangea/choreographer/choreo_record_model.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; @@ -23,10 +29,6 @@ import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_request_model.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart' hide Result; -import 'package:matrix/src/utils/markdown.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; class RepresentationEvent { Event? _event; diff --git a/lib/pangea/events/extensions/pangea_event_extension.dart b/lib/pangea/events/extensions/pangea_event_extension.dart index 82be8760c..aa99b690f 100644 --- a/lib/pangea/events/extensions/pangea_event_extension.dart +++ b/lib/pangea/events/extensions/pangea_event_extension.dart @@ -1,5 +1,9 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; + +import 'package:matrix/matrix.dart'; + import 'package:fluffychat/pangea/choreographer/choreo_record_model.dart'; import 'package:fluffychat/pangea/common/constants/model_keys.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; @@ -10,8 +14,6 @@ import 'package:fluffychat/pangea/practice_activities/practice_activity_model.da import 'package:fluffychat/pangea/practice_activities/practice_record.dart'; import 'package:fluffychat/pangea/toolbar/controllers/text_to_speech_controller.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_audio_card.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; extension PangeaEvent on Event { V getPangeaContent() { diff --git a/lib/pangea/events/models/representation_content_model.dart b/lib/pangea/events/models/representation_content_model.dart index 4bfeee4c8..c4ee4e43f 100644 --- a/lib/pangea/events/models/representation_content_model.dart +++ b/lib/pangea/events/models/representation_content_model.dart @@ -1,5 +1,7 @@ import 'dart:math'; +import 'package:matrix/matrix.dart'; + import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart'; import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart'; import 'package:fluffychat/pangea/choreographer/choreo_record_model.dart'; @@ -7,7 +9,6 @@ import 'package:fluffychat/pangea/choreographer/igc/pangea_match_status_enum.dar import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/events/models/pangea_token_model.dart'; import 'package:fluffychat/pangea/toolbar/models/speech_to_text_models.dart'; -import 'package:matrix/matrix.dart'; /// this class is contained within a [RepresentationEvent] /// this event is the child of a [EventTypes.Message] diff --git a/lib/pangea/extensions/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension.dart index 9f0246e1c..d414c7bf2 100644 --- a/lib/pangea/extensions/pangea_room_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension.dart @@ -4,7 +4,15 @@ import 'dart:async'; import 'dart:convert'; import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; +import 'package:html_unescape/html_unescape.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/src/utils/markdown.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart'; import 'package:fluffychat/pangea/analytics_misc/constructs_event.dart'; @@ -26,13 +34,6 @@ import 'package:fluffychat/pangea/lemmas/user_set_lemma_info.dart'; import 'package:fluffychat/pangea/spaces/constants/space_constants.dart'; import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:html_unescape/html_unescape.dart'; -import 'package:matrix/matrix.dart'; -import 'package:matrix/src/utils/markdown.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../choreographer/choreo_record_model.dart'; import '../events/constants/pangea_event_types.dart'; import '../events/models/representation_content_model.dart'; diff --git a/lib/pangea/learning_settings/widgets/language_mismatch_popup.dart b/lib/pangea/learning_settings/widgets/language_mismatch_popup.dart index e5f9298f6..715fd8c3f 100644 --- a/lib/pangea/learning_settings/widgets/language_mismatch_popup.dart +++ b/lib/pangea/learning_settings/widgets/language_mismatch_popup.dart @@ -1,9 +1,10 @@ +import 'package:flutter/material.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; import 'package:fluffychat/pangea/common/widgets/card_header.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; class LanguageMismatchPopup extends StatelessWidget { final Future Function() onConfirm; diff --git a/lib/pangea/subscription/widgets/paywall_card.dart b/lib/pangea/subscription/widgets/paywall_card.dart index 130156f60..6263dd162 100644 --- a/lib/pangea/subscription/widgets/paywall_card.dart +++ b/lib/pangea/subscription/widgets/paywall_card.dart @@ -1,10 +1,11 @@ +import 'package:flutter/material.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; import 'package:fluffychat/pangea/common/utils/overlay.dart'; import 'package:fluffychat/pangea/common/widgets/card_header.dart'; import 'package:fluffychat/pangea/subscription/repo/subscription_management_repo.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; class PaywallCard extends StatelessWidget { const PaywallCard({super.key}); diff --git a/lib/pangea/toolbar/controllers/tts_controller.dart b/lib/pangea/toolbar/controllers/tts_controller.dart index 6ef3c26b6..a7f90f52a 100644 --- a/lib/pangea/toolbar/controllers/tts_controller.dart +++ b/lib/pangea/toolbar/controllers/tts_controller.dart @@ -2,13 +2,19 @@ import 'dart:async'; import 'dart:convert'; import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; +import 'package:flutter_tts/flutter_tts.dart' as flutter_tts; +import 'package:just_audio/just_audio.dart'; +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/chat/events/audio_player.dart'; import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; -import 'package:fluffychat/pangea/common/utils/error_handler.dart' - as error_handler; import 'package:fluffychat/pangea/common/utils/overlay.dart'; import 'package:fluffychat/pangea/common/widgets/card_header.dart'; import 'package:fluffychat/pangea/events/models/pangea_token_text_model.dart'; @@ -16,12 +22,9 @@ import 'package:fluffychat/pangea/instructions/instructions_enum.dart'; import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart'; import 'package:fluffychat/pangea/toolbar/controllers/text_to_speech_controller.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_tts/flutter_tts.dart' as flutter_tts; -import 'package:just_audio/just_audio.dart'; -import 'package:matrix/matrix.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; + +import 'package:fluffychat/pangea/common/utils/error_handler.dart' + as error_handler; class TtsController { static List _availableLangCodes = []; diff --git a/lib/pangea/toolbar/reading_assistance_input_row/message_morph_choice.dart b/lib/pangea/toolbar/reading_assistance_input_row/message_morph_choice.dart index da6b2cdb8..f795c57c5 100644 --- a/lib/pangea/toolbar/reading_assistance_input_row/message_morph_choice.dart +++ b/lib/pangea/toolbar/reading_assistance_input_row/message_morph_choice.dart @@ -1,4 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/analytics_details_popup/morph_meaning_widget.dart'; import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart'; @@ -12,7 +15,6 @@ import 'package:fluffychat/pangea/practice_activities/practice_activity_model.da import 'package:fluffychat/pangea/practice_activities/practice_choice.dart'; import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/message_morph_choice_item.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart'; -import 'package:flutter/material.dart'; // this widget will handle the content of the input bar when mode == MessageMode.wordMorph diff --git a/lib/pangea/toolbar/reading_assistance_input_row/practice_match_card.dart b/lib/pangea/toolbar/reading_assistance_input_row/practice_match_card.dart index df2a98fcf..e461e6dad 100644 --- a/lib/pangea/toolbar/reading_assistance_input_row/practice_match_card.dart +++ b/lib/pangea/toolbar/reading_assistance_input_row/practice_match_card.dart @@ -1,6 +1,10 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:collection/collection.dart'; + import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pangea/common/widgets/choice_animation.dart'; import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart'; @@ -10,8 +14,6 @@ import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart'; import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/practice_match_item.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_audio_card.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; class MatchActivityCard extends StatelessWidget { final PracticeActivityModel currentActivity; diff --git a/lib/pangea/toolbar/widgets/practice_activity/multiple_choice_activity.dart b/lib/pangea/toolbar/widgets/practice_activity/multiple_choice_activity.dart index bd50d82f1..f5ce6de8f 100644 --- a/lib/pangea/toolbar/widgets/practice_activity/multiple_choice_activity.dart +++ b/lib/pangea/toolbar/widgets/practice_activity/multiple_choice_activity.dart @@ -1,5 +1,8 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/analytics_misc/put_analytics_controller.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; @@ -13,8 +16,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart'; import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_audio_button.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; /// The multiple choice activity view class MultipleChoiceActivity extends StatefulWidget { diff --git a/lib/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart index b55c0251f..c12bad187 100644 --- a/lib/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart +++ b/lib/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart @@ -1,6 +1,9 @@ import 'dart:async'; import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart'; import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart'; @@ -21,8 +24,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/multiple_choice_activity.dart'; import 'package:fluffychat/pangea/toolbar/widgets/toolbar_content_loading_indicator.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; /// The wrapper for practice activity content. /// Handles the activities associated with a message, diff --git a/lib/pangea/translation/full_text_translation_repo.dart b/lib/pangea/translation/full_text_translation_repo.dart index 0c15a84e1..85109ef50 100644 --- a/lib/pangea/translation/full_text_translation_repo.dart +++ b/lib/pangea/translation/full_text_translation_repo.dart @@ -4,11 +4,11 @@ import 'dart:async'; import 'dart:convert'; import 'package:async/async.dart'; +import 'package:http/http.dart'; + import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_request_model.dart'; import 'package:fluffychat/pangea/translation/full_text_translation_response_model.dart'; -import 'package:http/http.dart'; - import '../common/config/environment.dart'; import '../common/network/requests.dart'; import '../common/network/urls.dart'; diff --git a/test/pangea/choreo_record_test.dart b/test/pangea/choreo_record_test.dart index f2f1c5860..cd8ee065e 100644 --- a/test/pangea/choreo_record_test.dart +++ b/test/pangea/choreo_record_test.dart @@ -1,6 +1,7 @@ +import 'package:flutter_test/flutter_test.dart'; + import 'package:fluffychat/pangea/choreographer/choreo_edit_model.dart'; import 'package:fluffychat/pangea/choreographer/choreo_record_model.dart'; -import 'package:flutter_test/flutter_test.dart'; void main() async { group("Optimized choreo record tests", () {