From 6e3795fe482ace76f4105b1ff87343114a7b3c5b Mon Sep 17 00:00:00 2001 From: William Jordan-Cooley Date: Tue, 12 Nov 2024 16:49:31 -0500 Subject: [PATCH] removed redundant category from label copy --- assets/l10n/intl_en.arb | 182 +++++++++--------- lib/main.dart | 2 +- .../practice_activity_card.dart | 121 ++++++------ 3 files changed, 152 insertions(+), 153 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index e4290abd3..3b8d9860e 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -4247,7 +4247,7 @@ "grammarCopyPUNCTTYPEqest": "Question", "grammarCopyASPECTperf": "Perfect", "grammarCopyCASEaccnom": "Accusative, Nominative", - "grammarCopyCASEobl": "Oblique Case", + "grammarCopyCASEobl": "Oblique", "grammarCopyVOICEact": "Active", "grammarCopyPUNCTTYPEbrck": "Bracket", "grammarCopyNOUNTYPEart": "Article", @@ -4290,7 +4290,7 @@ "grammarCopyPRONTYPErel": "Relative", "grammarCopyVERBFORMfinalEnding": "Final Ending", "grammarCopyPRONTYPEdem": "Demonstrative", - "grammarCopyPREPCASEpre": "Preposition", + "grammarCopyPREPCASEpre": "Prepositional", "grammarCopyVERBFORMfin": "Finite", "grammarCopyDEGREEpos": "Positive", "grammarCopyPUNCTTYPEquot": "Quotation", @@ -4306,36 +4306,36 @@ "grammarCopyCASEloc": "Locative", "grammarCopyMOODind": "Indicative", "grammarCopyDEGREEcmp": "Comparative", - "grammarCopyCASErelativeCase": "Relative Case", + "grammarCopyCASErelativeCase": "Relative", "grammarCopyPUNCTTYPEexcl": "Exclamative", "grammarCopyPERSON1": "First Person", "grammarCopyPUNCTSIDEini": "Initial", "grammarCopyGENDERperson": "Person", "grammarCopyFOREIGNyes": "Foreign", "grammarCopyVOICEvoice": "Voice", - "grammarCopyVERBTYPEverbType": "Verb Type", + "grammarCopyVERBTYPEverbType": "Verb", "grammarCopyPOSSpass": "Possessive", - "grammarCopyPREPCASEprepCase": "Prepositional Case", - "grammarCopyNUMTYPEnumType": "Numeral Type", - "grammarCopyNOUNTYPEnounType": "Noun Type", + "grammarCopyPREPCASEprepCase": "Prepositional", + "grammarCopyNUMTYPEnumType": "Numeral", + "grammarCopyNOUNTYPEnounType": "Noun", "grammarCopyREFLEXreflex": "Reflexive", - "grammarCopyPRONTYPEpronType": "Pronoun Type", + "grammarCopyPRONTYPEpronType": "Pronoun", "grammarCopyPUNCTSIDEpunctSide": "Punctuation Side", - "grammarCopyVERBFORMverbForm": "Verb Form", + "grammarCopyVERBFORMverbForm": "Verb", "grammarCopyGENDERgender": "Gender", "grammarCopyMOODmood": "Mood", "grammarCopyASPECTaspect": "Aspect", - "grammarCopyPUNCTTYPEpunctType": "Punctuation Type", + "grammarCopyPUNCTTYPEpunctType": "Punctuation", "grammarCopyTENSEtense": "Tense", "grammarCopyDEGREEdegree": "Degree", "grammarCopyPOLITEpolite": "Politeness", - "grammarCopyADVTYPEadvType": "Adverb Type", + "grammarCopyADVTYPEadvType": "Adverb", "grammarCopyNUMFORMnumber": "Number", - "grammarCopyCONJTYPEconjType": "Conjunction Type", + "grammarCopyCONJTYPEconjType": "Conjunction", "grammarCopyPOLARITYpolarity": "Polarity", "grammarCopyCASEcase": "Case", "grammarCopyDEFINITEdefinite": "Definiteness", - "grammarCopyNUMFORMnumForm": "Numeral Form", + "grammarCopyNUMFORMnumForm": "Numeral", "grammarCopyPRONTYPEadn": "Adnominal", "grammarCopyVOCvoc": "Vocative", "grammarCopyCMPLcmpl": "Complementizer", @@ -4346,74 +4346,74 @@ "grammarCopyPARTTYPEpar": "Partitive", "grammarCopySPCspc": "Specific", "grammarCopyTENSEpqp": "Pluperfect", - "grammarCopyREFLEXref": "Reflexive Case", + "grammarCopyREFLEXref": "Reflexive", "grammarCopyPUNCTTYPEnshrt": "Short", "grammarCopyNUMBERdual": "Dual", "grammarCopyNUMFORMlng": "Long", - "grammarCopyVOICEmid": "Middle Voice", + "grammarCopyVOICEmid": "Middle", "grammarCopyINTRELintRel": "Interrogative, Relative", "grammarCopyINTint": "Interrogative", - "grammarCopyVOICEcaus": "Causative Voice", + "grammarCopyVOICEcaus": "Causative", "grammarCopyUnknown": "Unknown", "grammarCopyEVIDENTevident": "Evidentiality", "grammarCopyNUMFORMnumberPsor": "Possessor's Number", "grammarCopyASPECThab": "Habitual", - "grammarCopyCASEabl": "Ablative Case", - "grammarCopyCASEall": "Allative Case", - "grammarCopyCASEess": "Essive Case", - "grammarCopyCASEtra": "Translative Case", - "grammarCopyCASEequ": "Equative Case", - "grammarCopyCASEdis": "Distributive Case", - "grammarCopyCASEabs": "Absolutive Case", - "grammarCopyCASEerg": "Ergative Case", - "grammarCopyCASEcau": "Causal Case", - "grammarCopyCASEben": "Benefactive Case", - "grammarCopyCASEtem": "Temporal Case", - "grammarCopyCONJTYPEcoord": "Coordinating Conjunction", + "grammarCopyCASEabl": "Ablative", + "grammarCopyCASEall": "Allative", + "grammarCopyCASEess": "Essive", + "grammarCopyCASEtra": "Translative", + "grammarCopyCASEequ": "Equative", + "grammarCopyCASEdis": "Distributive", + "grammarCopyCASEabs": "Absolutive", + "grammarCopyCASEerg": "Ergative", + "grammarCopyCASEcau": "Causal", + "grammarCopyCASEben": "Benefactive", + "grammarCopyCASEtem": "Temporal", + "grammarCopyCONJTYPEcoord": "Coordinating", "grammarCopyDEFINITEcons": "Construct State", "grammarCopyDEGREEabs": "Absolute Degree", "grammarCopyEVIDENTfh": "Factual Evidentiality", "grammarCopyEVIDENTnfh": "Non-factual Evidentiality", - "grammarCopyMOODopt": "Optative Mood", - "grammarCopyMOODadm": "Admirative Mood", - "grammarCopyMOODdes": "Desiderative Mood", - "grammarCopyMOODnec": "Necessitative Mood", - "grammarCopyMOODpot": "Potential Mood", - "grammarCopyMOODprp": "Propositive Mood", - "grammarCopyMOODqot": "Quotative Mood", + "grammarCopyMOODopt": "Optative", + "grammarCopyMOODadm": "Admirative", + "grammarCopyMOODdes": "Desiderative", + "grammarCopyMOODnec": "Necessitative", + "grammarCopyMOODpot": "Potential", + "grammarCopyMOODprp": "Propositive", + "grammarCopyMOODqot": "Quotative", "grammarCopyNUMFORMword": "Word Form", "grammarCopyNUMFORMroman": "Roman Numeral", "grammarCopyNUMFORMletter": "Letter Form", - "grammarCopyNUMTYPEmult": "Multiplicative Numeral", - "grammarCopyNUMTYPEfrac": "Fractional Numeral", - "grammarCopyNUMTYPEsets": "Set Numeral", - "grammarCopyNUMTYPErange": "Range Numeral", - "grammarCopyNUMTYPEdist": "Distributive Numeral", - "grammarCopyNUMBERtri": "Trial Number", - "grammarCopyNUMBERpauc": "Paucal Number", - "grammarCopyNUMBERgrpa": "Greater Paucal Number", - "grammarCopyNUMBERgrpl": "Greater Plural Number", - "grammarCopyNUMBERinv": "Inverse Number", - "grammarCopyPERSON0": "Zero Person", - "grammarCopyPERSON4": "Fourth Person", - "grammarCopyPOLITEform": "Formal Politeness", - "grammarCopyPOLITEelev": "Elevated Politeness", - "grammarCopyPOLITEhumb": "Humble Politeness", - "grammarCopyPRONTYPEemp": "Emphatic Pronoun", - "grammarCopyPRONTYPEexc": "Exclamative Pronoun", - "grammarCopyPRONTYPErcp": "Reciprocal Pronoun", - "grammarCopyPRONTYPEintRelPronType": "Interrogative-Relative Pronoun", - "grammarCopyTENSEaor": "Aorist Tense", - "grammarCopyTENSEeps": "Epistemic Tense", - "grammarCopyTENSEprosp": "Prospective Tense", - "grammarCopyVERBFORMpart": "Participle Form", - "grammarCopyVERBFORMconv": "Converb Form", + "grammarCopyNUMTYPEmult": "Multiplicative", + "grammarCopyNUMTYPEfrac": "Fractional", + "grammarCopyNUMTYPEsets": "Set", + "grammarCopyNUMTYPErange": "Range", + "grammarCopyNUMTYPEdist": "Distributive", + "grammarCopyNUMBERtri": "Trial", + "grammarCopyNUMBERpauc": "Paucal", + "grammarCopyNUMBERgrpa": "Greater Paucal", + "grammarCopyNUMBERgrpl": "Greater Plural", + "grammarCopyNUMBERinv": "Inverse", + "grammarCopyPERSON0": "Zero", + "grammarCopyPERSON4": "Fourth", + "grammarCopyPOLITEform": "Formal", + "grammarCopyPOLITEelev": "Elevated", + "grammarCopyPOLITEhumb": "Humble", + "grammarCopyPRONTYPEemp": "Emphatic", + "grammarCopyPRONTYPEexc": "Exclamative", + "grammarCopyPRONTYPErcp": "Reciprocal", + "grammarCopyPRONTYPEintRelPronType": "Interrogative-Relative", + "grammarCopyTENSEaor": "Aorist", + "grammarCopyTENSEeps": "Epistemic", + "grammarCopyTENSEprosp": "Prospective", + "grammarCopyVERBFORMpart": "Participle", + "grammarCopyVERBFORMconv": "Converb", "grammarCopyVERBFORMvnoun": "Verbal Noun", - "grammarCopyVOICEantip": "Antipassive Voice", - "grammarCopyVOICEcauVoice": "Causative Voice", - "grammarCopyVOICedir": "Direct Voice", - "grammarCopyVOICEinvVoice": "Inverse Voice", - "grammarCopyVOICErcpVoice": "Reciprocal Voice", + "grammarCopyVOICEantip": "Antipassive", + "grammarCopyVOICEcauVoice": "Causative", + "grammarCopyVOICedir": "Direct", + "grammarCopyVOICEinvVoice": "Inverse", + "grammarCopyVOICErcpVoice": "Reciprocal", "grammarCopyPOS": "Part of Speech", "grammarCopyGENDER": "Gender", "grammarCopyPERSON": "Person", @@ -4449,18 +4449,18 @@ "grammarCopyNUMBERPSOR": "Possessor's Number", "grammarCopyPOSS": "Possessive", "grammarCopyASPECTimp": "Imperfective Aspect", - "grammarCopyCASEvoc": "Vocative Case", - "grammarCopyCASEcom": "Comitative Case", - "grammarCopyCASEpar": "Partitive Case", - "grammarCopyCASEadv": "Adverbial Case", - "grammarCopyCASEref": "Referential Case", - "grammarCopyCASErel": "Relative Case", - "grammarCopyCASEsub": "Subessive Case", - "grammarCopyCASEsup": "Superessive Case", - "grammarCopyCASEaccdat": "Accusative-Dative Case", - "grammarCopyCASEpre": "Prepositional Case", - "grammarCopyCONJTYPEsub": "Subordinating Conjunction", - "grammarCopyCONJTYPEcmp": "Comparative Conjunction", + "grammarCopyCASEvoc": "Vocative", + "grammarCopyCASEcom": "Comitative", + "grammarCopyCASEpar": "Partitive", + "grammarCopyCASEadv": "Adverbial", + "grammarCopyCASEref": "Referential", + "grammarCopyCASErel": "Relative", + "grammarCopyCASEsub": "Subessive", + "grammarCopyCASEsup": "Superessive", + "grammarCopyCASEaccdat": "Accusative-Dative", + "grammarCopyCASEpre": "Prepositional", + "grammarCopyCONJTYPEsub": "Subordinating", + "grammarCopyCONJTYPEcmp": "Comparative", "grammarCopyDEFINITEind": "Indefinite", "grammarCopyMOODint": "Interrogative Mood", "grammarCopyNOUNTYPEcomm": "Common Noun", @@ -4470,25 +4470,25 @@ "grammarCopyPOLARITYpos": "Positive Polarity", "grammarCopyPOSSyes": "Possessive", "grammarCopyPREPCASEnpr": "Non-prepositional", - "grammarCopyPRONTYPEprs": "Personal Pronoun", - "grammarCopyPRONTYPEint": "Interrogative Pronoun", - "grammarCopyPRONTYPEtot": "Total Pronoun", - "grammarCopyPRONTYPEneg": "Negative Pronoun", - "grammarCopyPRONTYPEart": "Article Pronoun", - "grammarCopyPRONTYPEind": "Indefinite Pronoun", - "grammarCopyPRONTYPEintrel": "Interrogative-Relative Pronoun", + "grammarCopyPRONTYPEprs": "Personal", + "grammarCopyPRONTYPEint": "Interrogative", + "grammarCopyPRONTYPEtot": "Total", + "grammarCopyPRONTYPEneg": "Negative", + "grammarCopyPRONTYPEart": "Article", + "grammarCopyPRONTYPEind": "Indefinite", + "grammarCopyPRONTYPEintrel": "Interrogative-Relative", "grammarCopyPUNCTSIDEfin": "Final Punctuation", "grammarCopyPUNCTTYPEperi": "Period", "grammarCopyREFLEXyes": "Reflexive", - "grammarCopyTENSEimp": "Imperfect Tense", - "grammarCopyVERBFORMsup": "Supine Form", - "grammarCopyVERBFORMadn": "Adnominal Form", - "grammarCopyVERBFORMlng": "Long Form", + "grammarCopyTENSEimp": "Imperfect", + "grammarCopyVERBFORMsup": "Supine", + "grammarCopyVERBFORMadn": "Adnominal", + "grammarCopyVERBFORMlng": "Long", "grammarCopyVERBTYPEcaus": "Causative Verb", - "grammarCopyVOICEcau": "Causative Voice", - "grammarCopyVOICEdir": "Direct Voice", - "grammarCopyVOICEinv": "Inverse Voice", - "grammarCopyVOICErcp": "Reciprocal Voice", + "grammarCopyVOICEcau": "Causative", + "grammarCopyVOICEdir": "Direct", + "grammarCopyVOICEinv": "Inverse", + "grammarCopyVOICErcp": "Reciprocal", "enterPrompt": "Please enter a system prompt", "selectBotLanguage": "Select bot language", "chooseVoice": "Choose a voice", diff --git a/lib/main.dart b/lib/main.dart index 9f5e656bd..847b012b2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -23,7 +23,7 @@ void main() async { // #Pangea try { - await dotenv.load(fileName: ".env"); + await dotenv.load(fileName: ".env.local_choreo"); } catch (e) { Logs().e('Failed to load .env file', e); } diff --git a/lib/pangea/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart index 8b64c4d2a..ea6c27251 100644 --- a/lib/pangea/widgets/practice_activity/practice_activity_card.dart +++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart @@ -103,79 +103,78 @@ class PracticeActivityCardState extends State { Future _fetchNewActivity([ ActivityQualityFeedback? activityFeedback, ]) async { - try { - debugPrint('Fetching new activity'); - - _updateFetchingActivity(true); - - // target tokens can be empty if activities have been completed for each - // it's set on initialization and then removed when each activity is completed - if (!pangeaController.languageController.languagesSet) { - debugger(when: kDebugMode); - _updateFetchingActivity(false); - return null; - } + // try { + debugPrint('Fetching new activity'); - if (!mounted) { - debugger(when: kDebugMode); - _updateFetchingActivity(false); - return null; - } + _updateFetchingActivity(true); - if (widget.pangeaMessageEvent.messageDisplayRepresentation == null) { - debugger(when: kDebugMode); - _updateFetchingActivity(false); - ErrorHandler.logError( - e: Exception('No original message found in _fetchNewActivity'), - data: { - 'event': widget.pangeaMessageEvent.event.toJson(), - }, - ); - return null; - } - - final PracticeActivityModelResponse? activityResponse = - await pangeaController.practiceGenerationController - .getPracticeActivity( - MessageActivityRequest( - userL1: pangeaController.languageController.userL1!.langCode, - userL2: pangeaController.languageController.userL2!.langCode, - messageText: widget.pangeaMessageEvent.messageDisplayText, - tokensWithXP: await widget.targetTokensController.targetTokens( - widget.pangeaMessageEvent, - ), - messageId: widget.pangeaMessageEvent.eventId, - existingActivities: practiceActivities - .map((activity) => activity.activityRequestMetaData) - .toList(), - activityQualityFeedback: activityFeedback, - clientCompatibleActivities: widget - .ttsController.isLanguageFullySupported - ? ActivityTypeEnum.values - : ActivityTypeEnum.values - .where((type) => type != ActivityTypeEnum.wordFocusListening) - .toList(), - ), - widget.pangeaMessageEvent, - ); + // target tokens can be empty if activities have been completed for each + // it's set on initialization and then removed when each activity is completed + if (!pangeaController.languageController.languagesSet) { + debugger(when: kDebugMode); + _updateFetchingActivity(false); + return null; + } - currentActivityCompleter = activityResponse?.eventCompleter; + if (!mounted) { + debugger(when: kDebugMode); _updateFetchingActivity(false); + return null; + } - return activityResponse?.activity; - } catch (e, s) { + if (widget.pangeaMessageEvent.messageDisplayRepresentation == null) { debugger(when: kDebugMode); + _updateFetchingActivity(false); ErrorHandler.logError( - e: e, - s: s, - m: 'Failed to get new activity', + e: Exception('No original message found in _fetchNewActivity'), data: { - 'activity': currentActivity, - 'record': currentCompletionRecord, + 'event': widget.pangeaMessageEvent.event.toJson(), }, ); return null; } + + final PracticeActivityModelResponse? activityResponse = + await pangeaController.practiceGenerationController.getPracticeActivity( + MessageActivityRequest( + userL1: pangeaController.languageController.userL1!.langCode, + userL2: pangeaController.languageController.userL2!.langCode, + messageText: widget.pangeaMessageEvent.messageDisplayText, + tokensWithXP: await widget.targetTokensController.targetTokens( + widget.pangeaMessageEvent, + ), + messageId: widget.pangeaMessageEvent.eventId, + existingActivities: practiceActivities + .map((activity) => activity.activityRequestMetaData) + .toList(), + activityQualityFeedback: activityFeedback, + clientCompatibleActivities: widget + .ttsController.isLanguageFullySupported + ? ActivityTypeEnum.values + : ActivityTypeEnum.values + .where((type) => type != ActivityTypeEnum.wordFocusListening) + .toList(), + ), + widget.pangeaMessageEvent, + ); + + currentActivityCompleter = activityResponse?.eventCompleter; + _updateFetchingActivity(false); + + return activityResponse?.activity; + // } catch (e, s) { + // debugger(when: kDebugMode); + // ErrorHandler.logError( + // e: e, + // s: s, + // m: 'Failed to get new activity', + // data: { + // 'activity': currentActivity, + // 'record': currentCompletionRecord, + // }, + // ); + // return null; + // } } ConstructUseMetaData get metadata => ConstructUseMetaData(