From 8b9fce8e56170aa479ace8b31a9b4ef979937ada Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:05:00 -0400 Subject: [PATCH] chore: formatting (#2315) --- lib/pages/chat/events/message_content.dart | 11 +- .../get_analytics_controller.dart | 161 +++++++++--------- .../practice_activities/practice_target.dart | 3 +- .../message_morph_choice.dart | 6 +- .../practice_match_item.dart | 5 +- .../widgets/message_selection_overlay.dart | 10 +- .../word_zoom/lemma_meaning_widget.dart | 10 +- .../word_zoom/morphological_list_item.dart | 6 +- .../widgets/word_zoom/word_zoom_widget.dart | 3 +- 9 files changed, 112 insertions(+), 103 deletions(-) diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index c04c5c6d5..be6888e33 100644 --- 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'; diff --git a/lib/pangea/analytics_misc/get_analytics_controller.dart b/lib/pangea/analytics_misc/get_analytics_controller.dart index e267f67e2..8cc2fdf0f 100644 --- a/lib/pangea/analytics_misc/get_analytics_controller.dart +++ b/lib/pangea/analytics_misc/get_analytics_controller.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:math'; import 'package:flutter/material.dart'; @@ -18,8 +17,6 @@ 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'; import 'package:fluffychat/pangea/constructs/construct_identifier.dart'; -import 'package:fluffychat/pangea/constructs/construct_repo.dart'; -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/practice_selection_repo.dart'; @@ -378,89 +375,89 @@ class GetAnalyticsController extends BaseController { _cache.add(entry); } - Future - _generateLevelUpAnalyticsAndSaveToStateEvent( - final int lowerLevel, - final int upperLevel, - ) async { - // generate level up analytics as a construct summary - ConstructSummary summary; - try { - final int maxXP = constructListModel.calculateXpWithLevel(upperLevel); - final int minXP = constructListModel.calculateXpWithLevel(lowerLevel); - int diffXP = maxXP - minXP; - if (diffXP < 0) diffXP = 0; +// Future +// _generateLevelUpAnalyticsAndSaveToStateEvent( +// final int lowerLevel, +// final int upperLevel, +// ) async { +// // generate level up analytics as a construct summary +// ConstructSummary summary; +// try { +// final int maxXP = constructListModel.calculateXpWithLevel(upperLevel); +// final int minXP = constructListModel.calculateXpWithLevel(lowerLevel); +// int diffXP = maxXP - minXP; +// if (diffXP < 0) diffXP = 0; - // compute construct use of current level - final List constructUseOfCurrentLevel = []; - int score = 0; - for (final use in constructListModel.uses) { - constructUseOfCurrentLevel.add(use); - score += use.pointValue; - if (score >= diffXP) break; - } +// // compute construct use of current level +// final List constructUseOfCurrentLevel = []; +// int score = 0; +// for (final use in constructListModel.uses) { +// constructUseOfCurrentLevel.add(use); +// score += use.pointValue; +// if (score >= diffXP) break; +// } - // extract construct use message bodies for analytics - List? constructUseMessageContentBodies = []; - for (final use in constructUseOfCurrentLevel) { - try { - final useMessage = await use.getEvent(_client); - final useMessageBody = useMessage?.content["body"]; - if (useMessageBody is String) { - constructUseMessageContentBodies.add(useMessageBody); - } else { - constructUseMessageContentBodies.add(null); - } - } catch (e) { - constructUseMessageContentBodies.add(null); - } - } - if (constructUseMessageContentBodies.length != - constructUseOfCurrentLevel.length) { - constructUseMessageContentBodies = null; - } +// // extract construct use message bodies for analytics +// List? constructUseMessageContentBodies = []; +// for (final use in constructUseOfCurrentLevel) { +// try { +// final useMessage = await use.getEvent(_client); +// final useMessageBody = useMessage?.content["body"]; +// if (useMessageBody is String) { +// constructUseMessageContentBodies.add(useMessageBody); +// } else { +// constructUseMessageContentBodies.add(null); +// } +// } catch (e) { +// constructUseMessageContentBodies.add(null); +// } +// } +// if (constructUseMessageContentBodies.length != +// constructUseOfCurrentLevel.length) { +// constructUseMessageContentBodies = null; +// } - final request = ConstructSummaryRequest( - constructs: constructUseOfCurrentLevel, - constructUseMessageContentBodies: constructUseMessageContentBodies, - language: _l2!.langCodeShort, - upperLevel: upperLevel, - lowerLevel: lowerLevel, - ); +// final request = ConstructSummaryRequest( +// constructs: constructUseOfCurrentLevel, +// constructUseMessageContentBodies: constructUseMessageContentBodies, +// language: _l2!.langCodeShort, +// upperLevel: upperLevel, +// lowerLevel: lowerLevel, +// ); - final response = await ConstructRepo.generateConstructSummary(request); - summary = response.summary; - } catch (e) { - debugPrint("Error generating level up analytics: $e"); - ErrorHandler.logError(e: e, data: {'e': e}); - return null; - } - String stateEventId; - try { - final Room? analyticsRoom = _client.analyticsRoomLocal(_l2!); - if (analyticsRoom == null) { - ErrorHandler.logError( - e: e, - data: {'e': e, 'message': "Analytics room not found for user"}, - ); - return null; - } - stateEventId = await _client.setRoomStateWithKey( - analyticsRoom.id, - PangeaEventTypes.constructSummary, - '', - summary.toJson(), - ); - } catch (e) { - debugPrint("Error saving construct summary room: $e"); - ErrorHandler.logError(e: e, data: {'e': e}); - return null; - } - return GenerateConstructSummaryResult( - stateEventId: stateEventId, - summary: summary, - ); - } +// final response = await ConstructRepo.generateConstructSummary(request); +// summary = response.summary; +// } catch (e) { +// debugPrint("Error generating level up analytics: $e"); +// ErrorHandler.logError(e: e, data: {'e': e}); +// return null; +// } +// String stateEventId; +// try { +// final Room? analyticsRoom = _client.analyticsRoomLocal(_l2!); +// if (analyticsRoom == null) { +// ErrorHandler.logError( +// e: e, +// data: {'e': e, 'message': "Analytics room not found for user"}, +// ); +// return null; +// } +// stateEventId = await _client.setRoomStateWithKey( +// analyticsRoom.id, +// PangeaEventTypes.constructSummary, +// '', +// summary.toJson(), +// ); +// } catch (e) { +// debugPrint("Error saving construct summary room: $e"); +// ErrorHandler.logError(e: e, data: {'e': e}); +// return null; +// } +// return GenerateConstructSummaryResult( +// stateEventId: stateEventId, +// summary: summary, +// ); +// } } class AnalyticsCacheEntry { diff --git a/lib/pangea/practice_activities/practice_target.dart b/lib/pangea/practice_activities/practice_target.dart index d29a58d79..4c9aff650 100644 --- a/lib/pangea/practice_activities/practice_target.dart +++ b/lib/pangea/practice_activities/practice_target.dart @@ -1,5 +1,7 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; + import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/constructs/construct_identifier.dart'; import 'package:fluffychat/pangea/events/models/pangea_token_model.dart'; @@ -8,7 +10,6 @@ import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart'; import 'package:fluffychat/pangea/practice_activities/practice_choice.dart'; import 'package:fluffychat/pangea/practice_activities/practice_record.dart'; import 'package:fluffychat/pangea/practice_activities/practice_record_repo.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 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 bad728095..b11b048ff 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,8 @@ +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/choreographer/widgets/choice_animation.dart'; import 'package:fluffychat/pangea/constructs/construct_form.dart'; @@ -11,8 +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'; -import 'package:flutter_gen/gen_l10n/l10n.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_item.dart b/lib/pangea/toolbar/reading_assistance_input_row/practice_match_item.dart index 229a61d2d..174280f0d 100644 --- a/lib/pangea/toolbar/reading_assistance_input_row/practice_match_item.dart +++ b/lib/pangea/toolbar/reading_assistance_input_row/practice_match_item.dart @@ -1,12 +1,13 @@ import 'dart:developer'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/practice_activities/practice_choice.dart'; import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; class PracticeMatchItem extends StatefulWidget { const PracticeMatchItem({ diff --git a/lib/pangea/toolbar/widgets/message_selection_overlay.dart b/lib/pangea/toolbar/widgets/message_selection_overlay.dart index b185f0083..b1b903c2c 100644 --- 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/common/utils/error_handler.dart'; @@ -25,10 +31,6 @@ import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/morph_sel 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 { diff --git a/lib/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart b/lib/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart index 8224d0f01..417dd9c95 100644 --- 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; diff --git a/lib/pangea/toolbar/widgets/word_zoom/morphological_list_item.dart b/lib/pangea/toolbar/widgets/word_zoom/morphological_list_item.dart index ca3ed8a90..7f448f52c 100644 --- a/lib/pangea/toolbar/widgets/word_zoom/morphological_list_item.dart +++ b/lib/pangea/toolbar/widgets/word_zoom/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'; @@ -7,8 +11,6 @@ import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart'; import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/morph_selection.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; diff --git a/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart b/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart index ee58118f7..d89aef17e 100644 --- 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'; @@ -16,7 +18,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/morphological_list_item.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; class WordZoomWidget extends StatelessWidget { final PangeaToken token;