From a2175d5206bcb37c70a519e8b5369a9c5581c59b Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 1 Nov 2024 11:54:00 -0400 Subject: [PATCH] removed unused context variable from tokensGlobal function --- .../pangea_message_event.dart | 4 +-- .../pangea_representation_event.dart | 3 +-- .../widgets/chat/message_audio_card.dart | 1 - .../widgets/chat/overlay_message_text.dart | 4 +-- .../practice_activity_card.dart | 2 -- .../target_tokens_controller.dart | 26 +++++-------------- 6 files changed, 9 insertions(+), 31 deletions(-) diff --git a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart index 39d1bd314..88bcf7f19 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart @@ -17,7 +17,6 @@ import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; import 'package:fluffychat/pangea/repo/full_text_translation_repo.dart'; import 'package:fluffychat/pangea/widgets/chat/message_audio_card.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; @@ -83,7 +82,6 @@ class PangeaMessageEvent { Future getMatrixAudioFile( String langCode, - BuildContext context, ) async { final RepresentationEvent? rep = representationByLanguage(langCode); @@ -91,7 +89,7 @@ class PangeaMessageEvent { final TextToSpeechRequest params = TextToSpeechRequest( text: rep.content.text, - tokens: (await rep.tokensGlobal(context)).map((t) => t.text).toList(), + tokens: (await rep.tokensGlobal()).map((t) => t.text).toList(), langCode: langCode, userL1: l1Code ?? LanguageKeys.unknownLanguage, userL2: l2Code ?? LanguageKeys.unknownLanguage, diff --git a/lib/pangea/matrix_event_wrappers/pangea_representation_event.dart b/lib/pangea/matrix_event_wrappers/pangea_representation_event.dart index 61d298807..7bd1381a8 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_representation_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_representation_event.dart @@ -6,7 +6,6 @@ import 'package:fluffychat/pangea/models/pangea_token_model.dart'; import 'package:fluffychat/pangea/models/token_api_models.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; import 'package:matrix/src/utils/markdown.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; @@ -118,7 +117,7 @@ class RepresentationEvent { return _tokens?.tokens; } - Future> tokensGlobal(BuildContext context) async { + Future> tokensGlobal() async { if (tokens != null) return tokens!; if (_event == null) { diff --git a/lib/pangea/widgets/chat/message_audio_card.dart b/lib/pangea/widgets/chat/message_audio_card.dart index 47cb41af8..302dcdef9 100644 --- a/lib/pangea/widgets/chat/message_audio_card.dart +++ b/lib/pangea/widgets/chat/message_audio_card.dart @@ -158,7 +158,6 @@ class MessageAudioCardState extends State { } else { audioFile = await widget.messageEvent.getMatrixAudioFile( langCode, - context, ); } debugPrint("audio file is now: $audioFile. setting starts and ends..."); diff --git a/lib/pangea/widgets/chat/overlay_message_text.dart b/lib/pangea/widgets/chat/overlay_message_text.dart index ababbf37c..40eb566d7 100644 --- a/lib/pangea/widgets/chat/overlay_message_text.dart +++ b/lib/pangea/widgets/chat/overlay_message_text.dart @@ -31,9 +31,7 @@ class OverlayMessageTextState extends State { void initState() { tokens = widget.pangeaMessageEvent.originalSent?.tokens; if (widget.pangeaMessageEvent.originalSent != null && tokens == null) { - widget.pangeaMessageEvent.originalSent! - .tokensGlobal(context) - .then((tokens) { + widget.pangeaMessageEvent.originalSent!.tokensGlobal().then((tokens) { // this isn't currently working because originalSent's _event is null setState(() => this.tokens = tokens); }); diff --git a/lib/pangea/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart index 53644494d..ee451d1d9 100644 --- a/lib/pangea/widgets/practice_activity/practice_activity_card.dart +++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart @@ -141,7 +141,6 @@ class PracticeActivityCardState extends State { userL2: pangeaController.languageController.userL2!.langCode, messageText: widget.pangeaMessageEvent.originalSent!.text, tokensWithXP: await targetTokensController.targetTokens( - context, widget.pangeaMessageEvent, ), messageId: widget.pangeaMessageEvent.eventId, @@ -218,7 +217,6 @@ class PracticeActivityCardState extends State { currentActivity!, metadata, ), - context, widget.pangeaMessageEvent, ); diff --git a/lib/pangea/widgets/practice_activity/target_tokens_controller.dart b/lib/pangea/widgets/practice_activity/target_tokens_controller.dart index 874a90a62..41b3b0402 100644 --- a/lib/pangea/widgets/practice_activity/target_tokens_controller.dart +++ b/lib/pangea/widgets/practice_activity/target_tokens_controller.dart @@ -4,10 +4,8 @@ import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dar import 'package:fluffychat/pangea/models/analytics/construct_list_model.dart'; import 'package:fluffychat/pangea/models/analytics/constructs_model.dart'; import 'package:fluffychat/pangea/models/practice_activities.dart/message_activity_request.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; /// Seperated out the target tokens from the practice activity card /// in order to control the state of the target tokens @@ -19,20 +17,18 @@ class TargetTokensController { /// From the tokens in the message, do a preliminary filtering of which to target /// Then get the construct uses for those tokens Future> targetTokens( - BuildContext context, PangeaMessageEvent pangeaMessageEvent, ) async { if (_targetTokens != null) { return _targetTokens!; } - _targetTokens = await _initialize(context, pangeaMessageEvent); + _targetTokens = await _initialize(pangeaMessageEvent); + final allConstructs = MatrixState + .pangeaController.analytics.analyticsStream.value?.constructs; await updateTokensWithConstructs( - MatrixState - .pangeaController.analytics.analyticsStream.value?.constructs ?? - [], - context, + allConstructs ?? [], pangeaMessageEvent, ); @@ -40,20 +36,11 @@ class TargetTokensController { } Future> _initialize( - BuildContext context, PangeaMessageEvent pangeaMessageEvent, ) async { - if (!context.mounted) { - ErrorHandler.logError( - m: 'getTargetTokens called when not mounted', - s: StackTrace.current, - ); - return _targetTokens = []; - } - final tokens = await pangeaMessageEvent .representationByLanguage(pangeaMessageEvent.messageDisplayLangCode) - ?.tokensGlobal(context); + ?.tokensGlobal(); if (tokens == null || tokens.isEmpty) { debugger(when: kDebugMode); @@ -66,7 +53,6 @@ class TargetTokensController { Future updateTokensWithConstructs( List constructUses, - context, pangeaMessageEvent, ) async { final ConstructListModel constructList = ConstructListModel( @@ -74,7 +60,7 @@ class TargetTokensController { type: null, ); - _targetTokens ??= await _initialize(context, pangeaMessageEvent); + _targetTokens ??= await _initialize(pangeaMessageEvent); for (final token in _targetTokens!) { // we don't need to do this for tokens that don't have saveVocab set to true