formatting (#2210)

2025-03-24 15:35:45 -04:00 · 2025-03-24 15:35:45 -04:00 · 06ee5403bb
commit 06ee5403bb
parent e3e81fbd68
63 changed files with 363 additions and 442 deletions
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@ -1,7 +1,9 @@
-import 'package:fluffychat/pangea/common/config/environment.dart';
 import 'package:flutter/material.dart';
+
 import 'package:matrix/matrix.dart';

+import 'package:fluffychat/pangea/common/config/environment.dart';
+
 abstract class AppConfig {
  // #Pangea
  // static String _applicationName = 'FluffyChat';
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@ -1,12 +1,6 @@
-import 'package:collection/collection.dart';
-import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pages/chat/chat.dart';
-import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
-import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
-import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
-import 'package:fluffychat/widgets/avatar.dart';
-import 'package:fluffychat/widgets/mxc_image.dart';
 import 'package:flutter/material.dart';
+
+import 'package:collection/collection.dart';
 import 'package:flutter_highlighter/flutter_highlighter.dart';
 import 'package:flutter_highlighter/themes/shades-of-purple.dart';
 import 'package:flutter_linkify/flutter_linkify.dart';
@ -14,6 +8,13 @@ import 'package:html/dom.dart' as dom;
 import 'package:html/parser.dart' as parser;
 import 'package:matrix/matrix.dart';

+import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/pages/chat/chat.dart';
+import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
+import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
+import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
+import 'package:fluffychat/widgets/avatar.dart';
+import 'package:fluffychat/widgets/mxc_image.dart';
 import '../../../utils/url_launcher.dart';

 class HtmlMessage extends StatelessWidget {
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@ -1,5 +1,11 @@
 import 'dart:math';

+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:flutter_linkify/flutter_linkify.dart';
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/chat/events/video_player.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/igc/pangea_rich_text.dart';
@ -11,11 +17,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart
 import 'package:fluffychat/pangea/toolbar/widgets/message_token_text.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_toolbar_selection_area.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:flutter_linkify/flutter_linkify.dart';
-import 'package:matrix/matrix.dart';
-
 import '../../../config/app_config.dart';
 import '../../../utils/platform_infos.dart';
 import '../../../utils/url_launcher.dart';
--- a/lib/pangea/analytics_details_popup/morph_analytics_list_view.dart
+++ b/lib/pangea/analytics_details_popup/morph_analytics_list_view.dart
@ -1,4 +1,7 @@
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/analytics_details_popup/analytics_details_popup.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
@ -12,7 +15,6 @@ import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/morphs/morph_icon.dart';
 import 'package:fluffychat/pangea/user/client_extension.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';

 class MorphAnalyticsListView extends StatelessWidget {
  final void Function(ConstructIdentifier) onConstructZoom;
--- a/lib/pangea/analytics_details_popup/morph_details_view.dart
+++ b/lib/pangea/analytics_details_popup/morph_details_view.dart
@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/analytics_details_popup/analytics_details_popup_content.dart';
 import 'package:fluffychat/pangea/analytics_details_popup/morph_meaning_widget.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
@ -6,10 +8,7 @@ import 'package:fluffychat/pangea/constructs/construct_level_enum.dart';
 import 'package:fluffychat/pangea/lemmas/construct_xp_widget.dart';
 import 'package:fluffychat/pangea/morphs/morph_feature_display.dart';
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
-import 'package:fluffychat/pangea/morphs/morph_meaning/morph_info_repo.dart';
 import 'package:fluffychat/pangea/morphs/morph_tag_display.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class MorphDetailsView extends StatelessWidget {
  final ConstructIdentifier constructId;
@ -23,11 +22,6 @@ class MorphDetailsView extends StatelessWidget {
  String get _morphFeature => constructId.category;
  String get _morphTag => constructId.lemma;

-  Future<String> _getDefinition(BuildContext context) => MorphInfoRepo.get(
-        feature: _construct.category,
-        tag: _construct.lemma,
-      ).then((value) => value ?? L10n.of(context).meaningNotFound);
-
  @override
  Widget build(BuildContext context) {
    final Color textColor = Theme.of(context).brightness != Brightness.light
--- a/lib/pangea/analytics_details_popup/vocab_analytics_details_view.dart
+++ b/lib/pangea/analytics_details_popup/vocab_analytics_details_view.dart
@ -1,3 +1,7 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/analytics_details_popup/analytics_details_popup_content.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
 import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
@ -9,8 +13,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_audio_b
 import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_text_with_audio_button.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 /// Displays information about selected lemma, and its usage
 class VocabDetailsView extends StatelessWidget {
--- a/lib/pangea/analytics_details_popup/vocab_analytics_list_tile.dart
+++ b/lib/pangea/analytics_details_popup/vocab_analytics_list_tile.dart
@ -1,8 +1,9 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
 import 'package:fluffychat/pangea/constructs/construct_level_enum.dart';
 import 'package:fluffychat/pangea/toolbar/utils/shrinkable_text.dart';
-import 'package:flutter/material.dart';

 class VocabAnalyticsListTile extends StatefulWidget {
  const VocabAnalyticsListTile({
--- a/lib/pangea/analytics_misc/construct_use_type_enum.dart
+++ b/lib/pangea/analytics_misc/construct_use_type_enum.dart
@ -1,8 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/analytics_downloads/analytics_summary_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/learning_skills_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 enum ConstructUseTypeEnum {
  /// produced in chat by user, igc was run, and we've judged it to be a correct use
--- a/lib/pangea/analytics_misc/get_analytics_controller.dart
+++ b/lib/pangea/analytics_misc/get_analytics_controller.dart
@ -1,6 +1,12 @@
 import 'dart:async';
 import 'dart:math';

+import 'package:flutter/material.dart';
+
+import 'package:get_storage/get_storage.dart';
+import 'package:matrix/matrix.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/client_analytics_extension.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_list_model.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
@ -17,10 +23,6 @@ import 'package:fluffychat/pangea/events/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/learning_settings/models/language_model.dart';
 import 'package:fluffychat/pangea/practice_activities/message_analytics_controller.dart';
-import 'package:flutter/material.dart';
-import 'package:get_storage/get_storage.dart';
-import 'package:matrix/matrix.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';

 /// A minimized version of AnalyticsController that get the logged in user's analytics
 class GetAnalyticsController extends BaseController {
--- a/lib/pangea/chat/utils/unlocked_morphs_snackbar.dart
+++ b/lib/pangea/chat/utils/unlocked_morphs_snackbar.dart
@ -8,6 +8,7 @@ import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
 import 'package:fluffychat/pangea/morphs/get_grammar_copy.dart';
+import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/morphs/morph_icon.dart';

 void showUnlockedMorphsSnackbar(
@ -63,7 +64,9 @@ void showUnlockedMorphsSnackbar(
                    ),
                  ),
                  MorphIcon(
-                    morphFeature: construct.category,
+                    morphFeature: MorphFeaturesEnumExtension.fromString(
+                      construct.category,
+                    ),
                    morphTag: construct.lemma,
                  ),
                ],
--- a/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
+++ b/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
@ -1,12 +1,13 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/practice_activities/message_analytics_controller.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_token_text.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:matrix/matrix.dart';
-
 import '../../../utils/matrix_sdk_extensions/matrix_locals.dart';

 class ChatListItemSubtitle extends StatelessWidget {
--- a/lib/pangea/constructs/construct_identifier.dart
+++ b/lib/pangea/constructs/construct_identifier.dart
@ -1,6 +1,11 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/client_analytics_extension.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
@ -19,9 +24,6 @@ import 'package:fluffychat/pangea/morphs/morph_icon.dart';
 import 'package:fluffychat/pangea/morphs/parts_of_speech_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';

 class ConstructIdentifier {
  final String lemma;
--- a/lib/pangea/events/event_wrappers/pangea_message_event.dart
+++ b/lib/pangea/events/event_wrappers/pangea_message_event.dart
@ -1,7 +1,12 @@
 import 'dart:convert';
 import 'dart:developer';

+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/models/choreo_record.dart';
 import 'package:fluffychat/pangea/choreographer/models/pangea_match_model.dart';
 import 'package:fluffychat/pangea/choreographer/repo/full_text_translation_repo.dart';
@ -19,10 +24,6 @@ import 'package:fluffychat/pangea/toolbar/enums/audio_encoding_enum.dart';
 import 'package:fluffychat/pangea/toolbar/event_wrappers/practice_activity_event.dart';
 import 'package:fluffychat/pangea/toolbar/models/speech_to_text_models.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_audio_card.dart';
-import 'package:flutter/foundation.dart';
-import 'package:matrix/matrix.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
-
 import '../../../widgets/matrix.dart';
 import '../../choreographer/enums/use_type.dart';
 import '../../common/utils/error_handler.dart';
--- a/lib/pangea/events/event_wrappers/pangea_representation_event.dart
+++ b/lib/pangea/events/event_wrappers/pangea_representation_event.dart
@ -2,7 +2,13 @@

 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
 import 'package:collection/collection.dart';
+import 'package:matrix/matrix.dart';
+import 'package:matrix/src/utils/markdown.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
 import 'package:fluffychat/pangea/choreographer/event_wrappers/pangea_choreo_event.dart';
 import 'package:fluffychat/pangea/choreographer/models/choreo_record.dart';
 import 'package:fluffychat/pangea/choreographer/models/language_detection_model.dart';
@ -18,10 +24,6 @@ import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/morphs/parts_of_speech_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:matrix/matrix.dart';
-import 'package:matrix/src/utils/markdown.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';

 class RepresentationEvent {
  Event? _event;
--- 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/models/choreo_record.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_activity_record_model.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<V>() {
--- a/lib/pangea/events/models/pangea_token_model.dart
+++ b/lib/pangea/events/models/pangea_token_model.dart
@ -1,6 +1,9 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
 import 'package:collection/collection.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/analytics_constants.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
@ -20,8 +23,6 @@ import 'package:fluffychat/pangea/morphs/parts_of_speech_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-
 import '../../common/constants/model_keys.dart';
 import '../../lemmas/lemma.dart';

--- a/lib/pangea/events/utils/message_text_util.dart
+++ b/lib/pangea/events/utils/message_text_util.dart
@ -1,8 +1,9 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
 import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/practice_activities/message_analytics_controller.dart';
-import 'package:flutter/material.dart';

 class TokenPosition {
  /// Start index of the full substring in the message
--- a/lib/pangea/instructions/instructions_inline_tooltip.dart
+++ b/lib/pangea/instructions/instructions_inline_tooltip.dart
@ -1,8 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class InstructionsInlineTooltip extends StatefulWidget {
  final InstructionsEnum instructionsEnum;
--- a/lib/pangea/learning_settings/pages/settings_learning_view.dart
+++ b/lib/pangea/learning_settings/pages/settings_learning_view.dart
@ -1,6 +1,12 @@
 import 'dart:io';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:app_settings/app_settings.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/chat_settings/widgets/language_level_dropdown.dart';
 import 'package:fluffychat/pangea/common/constants/model_keys.dart';
@ -14,10 +20,6 @@ import 'package:fluffychat/pangea/learning_settings/widgets/p_settings_switch_li
 import 'package:fluffychat/pangea/spaces/models/space_model.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:url_launcher/url_launcher_string.dart';

 class SettingsLearningView extends StatelessWidget {
  final SettingsLearningController controller;
--- a/lib/pangea/lemmas/lemma_info_repo.dart
+++ b/lib/pangea/lemmas/lemma_info_repo.dart
@ -1,6 +1,11 @@
 import 'dart:convert';
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
+import 'package:get_storage/get_storage.dart';
+import 'package:http/http.dart';
+
 import 'package:fluffychat/pangea/common/config/environment.dart';
 import 'package:fluffychat/pangea/common/network/requests.dart';
 import 'package:fluffychat/pangea/common/network/urls.dart';
@ -10,9 +15,6 @@ import 'package:fluffychat/pangea/lemmas/lemma_info_response.dart';
 import 'package:fluffychat/pangea/lemmas/user_set_lemma_info.dart';
 import 'package:fluffychat/pangea/message_token_text/message_token_button.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:get_storage/get_storage.dart';
-import 'package:http/http.dart';

 class LemmaInfoRepo {
  static final GetStorage _lemmaStorage = GetStorage('lemma_storage');
--- a/lib/pangea/message_token_text/message_token_button.dart
+++ b/lib/pangea/message_token_text/message_token_button.dart
@ -1,7 +1,12 @@
 import 'dart:developer';
 import 'dart:math';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/constructs/construct_form.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
@ -9,9 +14,6 @@ import 'package:fluffychat/pangea/practice_activities/target_tokens_and_activity
 import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/utils/shrinkable_text.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:material_symbols_icons/symbols.dart';

 const double tokenButtonHeight = 40.0;
 const double tokenButtonDefaultFontSize = 10;
--- a/lib/pangea/morphs/morph_feature_display.dart
+++ b/lib/pangea/morphs/morph_feature_display.dart
@ -1,6 +1,7 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/morphs/morph_icon.dart';
-import 'package:flutter/material.dart';

 class MorphFeatureDisplay extends StatelessWidget {
  MorphFeatureDisplay({
--- a/lib/pangea/morphs/morph_features_enum.dart
+++ b/lib/pangea/morphs/morph_features_enum.dart
@ -1,11 +1,13 @@
 // ignore_for_file: constant_identifier_names

-import 'package:collection/collection.dart';
-import 'package:fluffychat/pangea/common/utils/error_handler.dart';
 import 'package:flutter/material.dart';
+
+import 'package:collection/collection.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:material_symbols_icons/symbols.dart';

+import 'package:fluffychat/pangea/common/utils/error_handler.dart';
+
 enum MorphFeaturesEnum {
  Pos,
  AdvType,
--- a/lib/pangea/morphs/morph_icon.dart
+++ b/lib/pangea/morphs/morph_icon.dart
@ -1,9 +1,10 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/common/widgets/customized_svg.dart';
 import 'package:fluffychat/pangea/morphs/get_grammar_copy.dart';
 import 'package:fluffychat/pangea/morphs/get_svg_link.dart';
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/utils/color_value.dart';
-import 'package:flutter/material.dart';

 class MorphIcon extends StatelessWidget {
  const MorphIcon({
--- a/lib/pangea/morphs/morph_tag_display.dart
+++ b/lib/pangea/morphs/morph_tag_display.dart
@ -1,7 +1,8 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/morphs/get_grammar_copy.dart';
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/morphs/morph_icon.dart';
-import 'package:flutter/material.dart';

 class MorphTagDisplay extends StatelessWidget {
  const MorphTagDisplay({
--- a/lib/pangea/morphs/parts_of_speech_enum.dart
+++ b/lib/pangea/morphs/parts_of_speech_enum.dart
@ -1,12 +1,14 @@
 import 'dart:developer';

-import 'package:collection/collection.dart';
-import 'package:fluffychat/pangea/common/utils/error_handler.dart';
-import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+
+import 'package:collection/collection.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';

+import 'package:fluffychat/pangea/common/utils/error_handler.dart';
+import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
+
 /// list ordered by priority
 enum PartOfSpeechEnum {
  //Content tokens
--- a/lib/pangea/practice_activities/activity_type_enum.dart
+++ b/lib/pangea/practice_activities/activity_type_enum.dart
@ -1,7 +1,9 @@
-import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart';
 import 'package:flutter/material.dart';
+
 import 'package:material_symbols_icons/symbols.dart';

+import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart';
+
 enum ActivityTypeEnum {
  wordMeaning,
  wordFocusListening,
--- a/lib/pangea/practice_activities/emoji_activity_generator.dart
+++ b/lib/pangea/practice_activities/emoji_activity_generator.dart
@ -1,14 +1,16 @@
 import 'dart:developer';
 import 'dart:math';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/message_activity_request.dart';
 import 'package:fluffychat/pangea/practice_activities/multiple_choice_activity_model.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class EmojiActivityGenerator {
  Future<MessageActivityResponse> get(
--- a/lib/pangea/practice_activities/lemma_activity_generator.dart
+++ b/lib/pangea/practice_activities/lemma_activity_generator.dart
@ -1,5 +1,10 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
@ -7,9 +12,6 @@ import 'package:fluffychat/pangea/practice_activities/message_activity_request.d
 import 'package:fluffychat/pangea/practice_activities/multiple_choice_activity_model.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class LemmaActivityGenerator {
  Future<MessageActivityResponse> get(
--- a/lib/pangea/practice_activities/lemma_meaning_activity_generator.dart
+++ b/lib/pangea/practice_activities/lemma_meaning_activity_generator.dart
@ -1,5 +1,7 @@
 import 'dart:async';

+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
 import 'package:fluffychat/pangea/lemmas/lemma_info_repo.dart';
@ -12,7 +14,6 @@ import 'package:fluffychat/pangea/practice_activities/practice_activity_model.da
 import 'package:fluffychat/pangea/word_bank/vocab_bank_repo.dart';
 import 'package:fluffychat/pangea/word_bank/vocab_request.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class LemmaMeaningActivityGenerator {
  Future<MessageActivityResponse> get(
--- a/lib/pangea/practice_activities/message_activity_request.dart
+++ b/lib/pangea/practice_activities/message_activity_request.dart
@ -1,11 +1,13 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
 import 'package:collection/collection.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
-import 'package:flutter/foundation.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';

 // includes feedback text and the bad activity model
 class ActivityQualityFeedback {
--- a/lib/pangea/practice_activities/message_analytics_controller.dart
+++ b/lib/pangea/practice_activities/message_analytics_controller.dart
@ -1,12 +1,14 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
 import 'package:collection/collection.dart';
+
 import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/target_tokens_and_activity_type.dart';
-import 'package:flutter/foundation.dart';

 class MessageAnalyticsEntry {
  final DateTime createdAt = DateTime.now();
@ -44,14 +46,6 @@ class MessageAnalyticsEntry {
    }
  }

-  void _filterActivityQueue(ActivityTypeEnum activityType) {
-    _activityQueue[activityType]?.clear();
-  }
-
-  void _clearAllQueue() {
-    _activityQueue.clear();
-  }
-
  TargetTokensAndActivityType? nextActivity(ActivityTypeEnum a) =>
      _activityQueue[a]?.firstOrNull;

--- a/lib/pangea/practice_activities/morph_activity_generator.dart
+++ b/lib/pangea/practice_activities/morph_activity_generator.dart
@ -1,5 +1,9 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
 import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
@ -10,8 +14,6 @@ import 'package:fluffychat/pangea/practice_activities/message_activity_request.d
 import 'package:fluffychat/pangea/practice_activities/multiple_choice_activity_model.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 typedef MorphActivitySequence = Map<String, POSActivitySequence>;

--- a/lib/pangea/practice_activities/multiple_choice_activity_model.dart
+++ b/lib/pangea/practice_activities/multiple_choice_activity_model.dart
@ -1,11 +1,13 @@
 import 'dart:developer';

-import 'package:collection/collection.dart';
-import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

+import 'package:collection/collection.dart';
+
+import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
+
 class ActivityContent {
  final String question;

--- a/lib/pangea/practice_activities/practice_activity_model.dart
+++ b/lib/pangea/practice_activities/practice_activity_model.dart
@ -1,6 +1,12 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
@ -8,10 +14,6 @@ import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_display_instructions_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/multiple_choice_activity_model.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';

 class CandidateMessage {
  final String msgId;
--- a/lib/pangea/practice_activities/practice_activity_record_model.dart
+++ b/lib/pangea/practice_activities/practice_activity_record_model.dart
@ -5,12 +5,13 @@

 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.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/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
-import 'package:flutter/foundation.dart';

 class PracticeActivityRecordModel {
  final String? question;
--- a/lib/pangea/practice_activities/practice_repo.dart
+++ b/lib/pangea/practice_activities/practice_repo.dart
@ -2,6 +2,12 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import 'package:http/http.dart';
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/pangea/common/config/environment.dart';
 import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/common/network/requests.dart';
@ -18,10 +24,6 @@ import 'package:fluffychat/pangea/practice_activities/morph_activity_generator.d
 import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
 import 'package:fluffychat/pangea/toolbar/event_wrappers/practice_activity_event.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:http/http.dart';
-import 'package:matrix/matrix.dart';

 /// Represents an item in the completion cache.
 class _RequestCacheItem {
--- a/lib/pangea/practice_activities/target_tokens_and_activity_type.dart
+++ b/lib/pangea/practice_activities/target_tokens_and_activity_type.dart
@ -1,7 +1,8 @@
+import 'package:flutter/foundation.dart';
+
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
-import 'package:flutter/foundation.dart';

 /// Picks which tokens to do activities on and what types of activities to do
 /// Caches result so that we don't have to recompute it
--- a/lib/pangea/toolbar/enums/message_mode_enum.dart
+++ b/lib/pangea/toolbar/enums/message_mode_enum.dart
@ -1,4 +1,9 @@
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
@ -6,9 +11,6 @@ import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dar
 import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:material_symbols_icons/symbols.dart';

 enum MessageMode {
  practiceActivity,
--- a/lib/pangea/toolbar/event_wrappers/practice_activity_event.dart
+++ b/lib/pangea/toolbar/event_wrappers/practice_activity_event.dart
@ -1,11 +1,12 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/pangea/events/extensions/pangea_event_extension.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
 import 'package:fluffychat/pangea/toolbar/event_wrappers/practice_activity_record_event.dart';
-import 'package:flutter/foundation.dart';
-import 'package:matrix/matrix.dart';
-
 import '../../events/constants/pangea_event_types.dart';

 class PracticeActivityEvent {
--- a/lib/pangea/toolbar/event_wrappers/practice_activity_record_event.dart
+++ b/lib/pangea/toolbar/event_wrappers/practice_activity_record_event.dart
@ -1,7 +1,7 @@
-import 'package:fluffychat/pangea/events/extensions/pangea_event_extension.dart';
-import 'package:fluffychat/pangea/practice_activities/practice_activity_record_model.dart';
 import 'package:matrix/matrix.dart';

+import 'package:fluffychat/pangea/events/extensions/pangea_event_extension.dart';
+import 'package:fluffychat/pangea/practice_activities/practice_activity_record_model.dart';
 import '../../events/constants/pangea_event_types.dart';

 class PracticeActivityRecordEvent {
--- a/lib/pangea/toolbar/reading_assistance_input_row/message_emoji_choice_item.dart
+++ b/lib/pangea/toolbar/reading_assistance_input_row/message_emoji_choice_item.dart
@ -1,147 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
-
-const Size emojiButtonSize = Size(60, 60);
-BoxDecoration emojiButtonDecoration = BoxDecoration(
-  color: Colors.transparent,
-  borderRadius: BorderRadius.circular(AppConfig.borderRadius),
-);
-
-class MessageEmojiChoiceItem extends StatefulWidget {
-  const MessageEmojiChoiceItem({
-    super.key,
-    this.topContent,
-    this.textSize = 20,
-    required this.content,
-    required this.onTap,
-    this.onDoubleTap,
-    this.onLongPress,
-    required this.isSelected,
-    this.contentOpacity = 1.0,
-    required this.isGold,
-    required this.token,
-  });
-
-  final Widget? topContent;
-  final String content;
-  final void Function() onTap;
-  final void Function()? onDoubleTap;
-  final void Function()? onLongPress;
-  final bool isSelected;
-  final double textSize;
-  final double contentOpacity;
-  final PangeaToken? token;
-  final bool? isGold;
-
-  @override
-  MessageEmojiChoiceItemState createState() => MessageEmojiChoiceItemState();
-}
-
-class MessageEmojiChoiceItemState extends State<MessageEmojiChoiceItem> {
-  bool _isHovered = false;
-
-  @override
-  didUpdateWidget(MessageEmojiChoiceItem oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.isSelected != widget.isSelected ||
-        oldWidget.isGold != widget.isGold) {
-      setState(() {});
-    }
-  }
-
-  Color get color {
-    if (widget.isSelected) {
-      debugPrint('widget.isGold: ${widget.isGold}');
-      if (widget.isGold == null) {
-        return AppConfig.primaryColor.withAlpha((0.4 * 255).toInt());
-      } else {
-        return widget.isGold!
-            ? AppConfig.success.withAlpha((0.4 * 255).toInt())
-            : AppConfig.warning.withAlpha((0.4 * 255).toInt());
-      }
-    }
-    if (_isHovered) {
-      return AppConfig.primaryColor.withAlpha((0.2 * 255).toInt());
-    }
-    return Colors.transparent;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-<<<<<<< HEAD
-    return Opacity(
-      opacity: widget.contentOpacity,
-      child: MouseRegion(
-        onEnter: (_) => setState(() => _isHovered = true),
-        onExit: (_) => setState(() => _isHovered = false),
-        child: InkWell(
-          borderRadius: BorderRadius.circular(AppConfig.borderRadius),
-          onTap: widget.onTap,
-          onLongPress: widget.onLongPress,
-          child: Container(
-            height: emojiButtonSize.height,
-            width: emojiButtonSize.width,
-            alignment: Alignment.center,
-            decoration: BoxDecoration(
-              color: color,
-              borderRadius: BorderRadius.circular(AppConfig.borderRadius),
-            ),
-            child: Text(
-              widget.content,
-              style: TextStyle(fontSize: widget.textSize - 2),
-=======
-    return IntrinsicWidth(
-      child: Align(
-        alignment: Alignment.center,
-        child: MouseRegion(
-          onEnter: (_) => setState(() => _isHovered = true),
-          onExit: (_) => setState(() => _isHovered = false),
-          child: InkWell(
-            borderRadius: BorderRadius.circular(AppConfig.borderRadius),
-            onTap: widget.onTap,
-            onLongPress: widget.onLongPress,
-            child: Container(
-              alignment: Alignment.center,
-              decoration: BoxDecoration(
-                color: widget.isSelected
-                    ? Theme.of(context)
-                        .colorScheme
-                        .primary
-                        .withAlpha((0.2 * 255).toInt())
-                    : _isHovered
-                        ? Theme.of(context)
-                            .colorScheme
-                            .primary
-                            .withAlpha((0.1 * 255).toInt())
-                        : widget.greenHighlight
-                            ? AppConfig.success.withAlpha((0.1 * 255).toInt())
-                            : Colors.transparent,
-                borderRadius: BorderRadius.circular(AppConfig.borderRadius),
-              ),
-              child: Container(
-                padding: const EdgeInsets.all(8.0),
-                margin: const EdgeInsets.all(4.0),
-                child: Column(
-                  children: [
-                    if (widget.topContent != null)
-                      Opacity(
-                        opacity: widget.contentOpacity,
-                        child: widget.topContent,
-                      ),
-                    Text(
-                      widget.content,
-                      style: TextStyle(fontSize: widget.textSize - 2),
-                    ),
-                  ],
-                ),
-              ),
->>>>>>> main
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
--- a/lib/pangea/toolbar/reading_assistance_input_row/message_match_activity.dart
+++ b/lib/pangea/toolbar/reading_assistance_input_row/message_match_activity.dart
@ -1,5 +1,8 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/constructs/construct_form.dart';
 import 'package:fluffychat/pangea/message_token_text/message_token_button.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
@ -8,8 +11,6 @@ import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/message_match_activity_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 MessageMatchActivity extends StatelessWidget {
  final MessageOverlayController overlayController;
--- a/lib/pangea/toolbar/reading_assistance_input_row/message_match_activity_item.dart
+++ b/lib/pangea/toolbar/reading_assistance_input_row/message_match_activity_item.dart
@ -1,14 +1,16 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
 import 'package:fluffychat/pangea/constructs/construct_form.dart';
 import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart';
 import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/match_feedback_model.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';

 class MessageMatchActivityItem extends StatefulWidget {
  const MessageMatchActivityItem({
--- 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,6 +1,11 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
@ -18,9 +23,6 @@ import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/message_m
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/morphs/morphological_center_widget.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 // this widget will handle the content of the input bar when mode == MessageMode.wordMorph

--- a/lib/pangea/toolbar/reading_assistance_input_row/message_morph_choice_item.dart
+++ b/lib/pangea/toolbar/reading_assistance_input_row/message_morph_choice_item.dart
@ -1,9 +1,10 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
 import 'package:fluffychat/pangea/morphs/get_grammar_copy.dart';
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
 import 'package:fluffychat/pangea/morphs/morph_icon.dart';
-import 'package:flutter/material.dart';

 class MessageMorphChoiceItem extends StatefulWidget {
  const MessageMorphChoiceItem({
--- a/lib/pangea/toolbar/reading_assistance_input_row/reading_assistance_input_bar.dart
+++ b/lib/pangea/toolbar/reading_assistance_input_row/reading_assistance_input_bar.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/pages/chat/chat.dart';
 import 'package:fluffychat/pangea/analytics_misc/put_analytics_controller.dart';
@ -14,8 +17,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/message_mode_locked_card.dart'
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_translation_card.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';

 class ReadingAssistanceInputBar extends StatelessWidget {
  final ChatController controller;
--- a/lib/pangea/toolbar/reading_assistance_input_row/word_emoji_choice.dart
+++ b/lib/pangea/toolbar/reading_assistance_input_row/word_emoji_choice.dart
@ -1,134 +1,132 @@
-import 'package:flutter/material.dart';
+// import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.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/analytics_misc/put_analytics_controller.dart';
+// import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart';
+// import 'package:fluffychat/pangea/choreographer/widgets/it_shimmer.dart';
+// import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
+// import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
+// import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart';
+// import 'package:fluffychat/widgets/matrix.dart';
+// import 'package:flutter/material.dart';
+// import 'package:flutter_gen/gen_l10n/l10n.dart';

-import 'package:flutter_gen/gen_l10n/l10n.dart';
+// class WordEmojiChoice extends StatefulWidget {
+//   const WordEmojiChoice({
+//     super.key,
+//     required this.constructID,
+//     required this.onEmojiChosen,
+//     required this.form,
+//     this.roomId,
+//     this.eventId,
+//   });

-import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.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/analytics_misc/put_analytics_controller.dart';
-import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart';
-import 'package:fluffychat/pangea/choreographer/widgets/it_shimmer.dart';
-import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
-import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
-import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart';
-import 'package:fluffychat/widgets/matrix.dart';
+//   final ConstructIdentifier constructID;
+//   final String form;
+//   final String? roomId;
+//   final String? eventId;
+//   final void Function() onEmojiChosen;

-class WordEmojiChoice extends StatefulWidget {
-  const WordEmojiChoice({
-    super.key,
-    required this.constructID,
-    required this.onEmojiChosen,
-    required this.form,
-    this.roomId,
-    this.eventId,
-  });
+//   @override
+//   WordEmojiChoiceState createState() => WordEmojiChoiceState();
+// }

-  final ConstructIdentifier constructID;
-  final String form;
-  final String? roomId;
-  final String? eventId;
-  final void Function() onEmojiChosen;
+// class WordEmojiChoiceState extends State<WordEmojiChoice> {
+//   String? localSelected;

-  @override
-  WordEmojiChoiceState createState() => WordEmojiChoiceState();
-}
+//   @override
+//   void initState() {
+//     super.initState();
+//     localSelected = widget.constructID.userSetEmoji.single;
+//   }

-class WordEmojiChoiceState extends State<WordEmojiChoice> {
-  String? localSelected;
+//   Future<void> onChoice(BuildContext context, emoji) async {
+//     setState(() => localSelected = emoji);

-  @override
-  void initState() {
-    super.initState();
-    localSelected = widget.constructID.userSetEmoji;
-  }
+//     MatrixState.pangeaController.putAnalytics.setState(
+//       AnalyticsStream(
+//         eventId: widget.eventId,
+//         roomId: widget.roomId,
+//         constructs: [
+//           OneConstructUse(
+//             useType: ConstructUseTypeEnum.em,
+//             lemma: widget.constructID.lemma,
+//             constructType: ConstructTypeEnum.vocab,
+//             metadata: ConstructUseMetaData(
+//               roomId: widget.roomId,
+//               timeStamp: DateTime.now(),
+//               eventId: widget.eventId,
+//             ),
+//             category: widget.constructID.category,
+//             form: widget.form,
+//           ),
+//         ],
+//         origin: AnalyticsUpdateOrigin.wordZoom,
+//       ),
+//     );

-  Future<void> onChoice(BuildContext context, emoji) async {
-    setState(() => localSelected = emoji);
+//     await widget.constructID.setEmoji(emoji);

-    MatrixState.pangeaController.putAnalytics.setState(
-      AnalyticsStream(
-        eventId: widget.eventId,
-        roomId: widget.roomId,
-        constructs: [
-          OneConstructUse(
-            useType: ConstructUseTypeEnum.em,
-            lemma: widget.constructID.lemma,
-            constructType: ConstructTypeEnum.vocab,
-            metadata: ConstructUseMetaData(
-              roomId: widget.roomId,
-              timeStamp: DateTime.now(),
-              eventId: widget.eventId,
-            ),
-            category: widget.constructID.category,
-            form: widget.form,
-          ),
-        ],
-        origin: AnalyticsUpdateOrigin.wordZoom,
-      ),
-    );
+//     await Future.delayed(
+//       const Duration(milliseconds: choiceArrayAnimationDuration),
+//     );

-    await widget.constructID.setEmoji(emoji);
+//     widget.onEmojiChosen();

-    await Future.delayed(
-      const Duration(milliseconds: choiceArrayAnimationDuration),
-    );
+//     setState(() => {});
+//   }

-    widget.onEmojiChosen();
+//   @override
+//   Widget build(BuildContext context) {
+//     return SingleChildScrollView(
+//       child: Column(
+//         mainAxisAlignment: MainAxisAlignment.center,
+//         mainAxisSize: MainAxisSize.max,
+//         children: [
+//           FutureBuilder(
+//             future: widget.constructID.getEmojiChoices(),
+//             builder: (context, snapshot) {
+//               if (snapshot.hasError) {
+//                 return Text(L10n.of(context).oopsSomethingWentWrong);
+//               }

-    setState(() => {});
-  }
+//               if (snapshot.connectionState == ConnectionState.waiting ||
+//                   snapshot.data == null) {
+//                 return const ItShimmer(originalSpan: "😀", fontSize: 26);
+//               }

-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        mainAxisSize: MainAxisSize.max,
-        children: [
-          FutureBuilder(
-            future: widget.constructID.getEmojiChoices(),
-            builder: (context, snapshot) {
-              if (snapshot.hasError) {
-                return Text(L10n.of(context).oopsSomethingWentWrong);
-              }
-
-              if (snapshot.connectionState == ConnectionState.waiting ||
-                  snapshot.data == null) {
-                return const ItShimmer(originalSpan: "😀", fontSize: 26);
-              }
-
-              return ChoicesArray(
-                isLoading: snapshot.connectionState == ConnectionState.waiting,
-                choices: snapshot.data!
-                    .map(
-                      (emoji) => Choice(
-                        color: localSelected == emoji
-                            ? Theme.of(context).colorScheme.primary
-                            : Colors.transparent,
-                        text: emoji,
-                        isGold: localSelected == emoji,
-                      ),
-                    )
-                    .toList(),
-                onPressed: (emoji, index) => onChoice(context, emoji),
-                originalSpan: "😀",
-                uniqueKeyForLayerLink: (int index) => "emojiChoice$index",
-                selectedChoiceIndex: snapshot.data!.indexWhere(
-                  (element) => element == widget.constructID.userSetEmoji,
-                ),
-                tts: null,
-                fontSize: 26,
-                enableMultiSelect: true,
-                isActive: true,
-                overflowMode: OverflowMode.horizontalScroll,
-              );
-            },
-          ),
-          const InstructionsInlineTooltip(
-            instructionsEnum: InstructionsEnum.chooseEmoji,
-          ),
-        ],
-      ),
-    );
-  }
-}
+//               return ChoicesArray(
+//                 isLoading: snapshot.connectionState == ConnectionState.waiting,
+//                 choices: snapshot.data!
+//                     .map(
+//                       (emoji) => Choice(
+//                         color: localSelected == emoji
+//                             ? Theme.of(context).colorScheme.primary
+//                             : Colors.transparent,
+//                         text: emoji,
+//                         isGold: localSelected == emoji,
+//                       ),
+//                     )
+//                     .toList(),
+//                 onPressed: (emoji, index) => onChoice(context, emoji),
+//                 originalSpan: "😀",
+//                 uniqueKeyForLayerLink: (int index) => "emojiChoice$index",
+//                 selectedChoiceIndex: snapshot.data!.indexWhere(
+//                   (element) => element == widget.constructID.userSetEmoji,
+//                 ),
+//                 tts: null,
+//                 fontSize: 26,
+//                 enableMultiSelect: true,
+//                 isActive: true,
+//                 overflowMode: OverflowMode.horizontalScroll,
+//               );
+//             },
+//           ),
+//           const InstructionsInlineTooltip(
+//             instructionsEnum: InstructionsEnum.chooseEmoji,
+//           ),
+//         ],
+//       ),
+//     );
+//   }
+// }
--- a/lib/pangea/toolbar/widgets/message_mode_locked_card.dart
+++ b/lib/pangea/toolbar/widgets/message_mode_locked_card.dart
@ -1,7 +1,8 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
 import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
-import 'package:flutter/material.dart';

 class MessageModeLockedCard extends StatelessWidget {
  final MessageOverlayController controller;
--- a/lib/pangea/toolbar/widgets/message_selection_overlay.dart
+++ b/lib/pangea/toolbar/widgets/message_selection_overlay.dart
@ -1,7 +1,13 @@
 import 'dart:async';
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+
 import 'package:collection/collection.dart';
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
@ -28,10 +34,6 @@ import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/match_fee
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_positioner.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/reading_assistance_content.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
-import 'package:matrix/matrix.dart';

 /// Controls data at the top level of the toolbar (mainly token / toolbar mode selection)
 class MessageSelectionOverlay extends StatefulWidget {
--- a/lib/pangea/toolbar/widgets/message_token_text.dart
+++ b/lib/pangea/toolbar/widgets/message_token_text.dart
@ -1,4 +1,8 @@
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+import 'package:flutter_linkify/flutter_linkify.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/common/utils/any_state_holder.dart';
 import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
@ -10,8 +14,6 @@ import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/utils/url_launcher.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_linkify/flutter_linkify.dart';

 /// Question - does this need to be stateful or does this work?
 /// Need to test.
@ -243,21 +245,6 @@ class MessageTextWidget extends StatelessWidget {
              .take(tokenPosition.end - tokenPosition.start)
              .toString();

-<<<<<<< HEAD
-=======
-          Color backgroundColor = Colors.transparent;
-          if (!hideTokenHighlights) {
-            if (tokenPosition.selected) {
-              backgroundColor =
-                  Theme.of(context).colorScheme.primary.withAlpha(80);
-            } else if (isSelected != null && shouldDo) {
-              backgroundColor = !didMeaningActivity
-                  ? AppConfig.success.withAlpha(60)
-                  : AppConfig.gold.withAlpha(60);
-            }
-          }
-
->>>>>>> main
          if (tokenPosition.token?.pos == 'SPACE') {
            return const TextSpan(text: '\n');
          }
--- a/lib/pangea/toolbar/widgets/message_translation_card.dart
+++ b/lib/pangea/toolbar/widgets/message_translation_card.dart
@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/igc/card_error_widget.dart';
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
@ -7,7 +9,6 @@ import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
 import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/toolbar_content_loading_indicator.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';

 class MessageTranslationCard extends StatefulWidget {
  final PangeaMessageEvent messageEvent;
--- 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,10 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/analytics_misc/put_analytics_controller.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart';
@ -14,9 +19,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';
-import 'package:matrix/matrix.dart';

 /// The multiple choice activity view
 class MultipleChoiceActivity extends StatefulWidget {
--- a/lib/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart
+++ b/lib/pangea/toolbar/widgets/practice_activity/practice_activity_card.dart
@ -1,7 +1,11 @@
 import 'dart:async';
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:collection/collection.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
 import 'package:fluffychat/pangea/analytics_misc/gain_points_animation.dart';
@ -23,8 +27,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/multiple_cho
 import 'package:fluffychat/pangea/toolbar/widgets/toolbar_content_loading_indicator.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/word_zoom_widget.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,
--- a/lib/pangea/toolbar/widgets/practice_activity/word_audio_button.dart
+++ b/lib/pangea/toolbar/widgets/practice_activity/word_audio_button.dart
@ -1,8 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
 import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class WordAudioButton extends StatefulWidget {
  final String text;
--- a/lib/pangea/toolbar/widgets/reading_assistance_content.dart
+++ b/lib/pangea/toolbar/widgets/reading_assistance_content.dart
@ -1,3 +1,8 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:matrix/matrix_api_lite/model/message_types.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pangea/analytics_misc/put_analytics_controller.dart';
@ -11,9 +16,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/practice_act
 import 'package:fluffychat/pangea/toolbar/widgets/toolbar_content_loading_indicator.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:matrix/matrix_api_lite/model/message_types.dart';

 const double minCardHeight = 70;

--- a/lib/pangea/toolbar/widgets/toolbar_button.dart
+++ b/lib/pangea/toolbar/widgets/toolbar_button.dart
@ -1,8 +1,9 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pangea/common/widgets/pressable_button.dart';
 import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
-import 'package:flutter/material.dart';

 class ToolbarButton extends StatelessWidget {
  final MessageMode mode;
--- a/lib/pangea/toolbar/widgets/toolbar_button_column.dart
+++ b/lib/pangea/toolbar/widgets/toolbar_button_column.dart
@ -1,8 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/toolbar_button.dart';
-import 'package:flutter/material.dart';
-import 'package:matrix/matrix.dart';

 class ToolbarButtonRow extends StatelessWidget {
  final Event event;
--- a/lib/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart
@ -1,5 +1,11 @@
 import 'dart:developer';

+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
 import 'package:fluffychat/pangea/analytics_misc/text_loading_shimmer.dart';
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
@ -12,10 +18,6 @@ import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_zoom_activity_button.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:material_symbols_icons/symbols.dart';

 class LemmaMeaningWidget extends StatefulWidget {
  final ConstructUses constructUse;
--- a/lib/pangea/toolbar/widgets/word_zoom/lemma_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/lemma_widget.dart
@ -1,3 +1,7 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/common/constants/model_keys.dart';
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
 import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
@ -9,8 +13,6 @@ import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_audio_button.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class LemmaWidget extends StatefulWidget {
  final PangeaToken token;
--- a/lib/pangea/toolbar/widgets/word_zoom/morphs/morphological_center_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/morphs/morphological_center_widget.dart
@ -1,6 +1,10 @@
 // stateful widget that displays morphological label and a shimmer effect while the text is loading
 // takes a token and morphological feature as input

+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/analytics_details_popup/analytics_details_popup.dart';
 import 'package:fluffychat/pangea/analytics_details_popup/morph_meaning_widget.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
@ -21,8 +25,6 @@ import 'package:fluffychat/pangea/morphs/morph_repo.dart';
 import 'package:fluffychat/pangea/morphs/morph_tag_display.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class MorphFocusWidget extends StatefulWidget {
  final PangeaToken token;
--- a/lib/pangea/toolbar/widgets/word_zoom/morphs/morphological_list_item.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/morphs/morphological_list_item.dart
@ -1,3 +1,7 @@
+import 'package:flutter/material.dart';
+
+import 'package:material_symbols_icons/symbols.dart';
+
 import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/morphs/get_grammar_copy.dart';
 import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
@ -6,8 +10,6 @@ import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_zoom_activity_button.dart';
-import 'package:flutter/material.dart';
-import 'package:material_symbols_icons/symbols.dart';

 class MorphologicalListItem extends StatelessWidget {
  final MorphFeaturesEnum morphFeature;
--- a/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/analytics_details_popup/analytics_details_popup.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
@ -17,7 +19,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget
 import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/lemma_widget.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/morphs/morphological_list_item.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';

 class WordZoomWidget extends StatelessWidget {
  final PangeaToken token;
@ -69,9 +70,10 @@ class WordZoomWidget extends StatelessWidget {
                    children: [
                      //@ggurdin - might need to play with size to properly center
                      IconButton(
-                          onPressed: () => overlayController
-                              .onClickOverlayMessageToken(token),
-                          icon: const Icon(Icons.close)),
+                        onPressed: () =>
+                            overlayController.onClickOverlayMessageToken(token),
+                        icon: const Icon(Icons.close),
+                      ),
                      LemmaWidget(
                        token: _selectedToken,
                        pangeaMessageEvent: messageEvent,