From 40c4045f865204f87f95896e62de47cf7cca879b Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:17:48 -0400 Subject: [PATCH 01/12] fixes for exiting IT and editing original message --- .../controllers/it_controller.dart | 23 ++++++++++++++----- lib/pangea/choreographer/widgets/it_bar.dart | 7 +++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index 6d5f8e347..91899a71a 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -61,11 +61,9 @@ class ITController { } void closeIT() { - //if they close it before choosing anything, just put their text back + //if they close it before completing, just put their text back //PTODO - explore using last itStep - if (choreographer.currentText.isEmpty) { - choreographer.textController.text = sourceText ?? ""; - } + choreographer.textController.text = sourceText ?? ""; clear(); } @@ -217,8 +215,20 @@ class ITController { Future onEditSourceTextSubmit(String newSourceText) async { try { - sourceText = newSourceText; + + _isOpen = true; _isEditingSourceText = false; + _itStartData = ITStartData(newSourceText, choreographer.l1LangCode); + completedITSteps = []; + currentITStep = null; + nextITStep = null; + goldRouteTracker = GoldRouteTracker.defaultTracker; + payLoadIds = []; + + _setSourceText(); + getTranslationData(false); + + /*sourceText = newSourceText; final String currentText = choreographer.currentText; choreographer.startLoading(); @@ -241,7 +251,7 @@ class ITController { storedGoldContinuances: goldRouteTracker.continuances, ); - _addPayloadId(responses[1]); + _addPayloadId(responses[1]);*/ } catch (err, stack) { debugger(when: kDebugMode); if (err is! http.Response) { @@ -252,6 +262,7 @@ class ITController { ); } finally { choreographer.stopLoading(); + choreographer.textController.text = ""; } } diff --git a/lib/pangea/choreographer/widgets/it_bar.dart b/lib/pangea/choreographer/widgets/it_bar.dart index 4e26cba58..013c7238b 100644 --- a/lib/pangea/choreographer/widgets/it_bar.dart +++ b/lib/pangea/choreographer/widgets/it_bar.dart @@ -184,7 +184,12 @@ class OriginalText extends StatelessWidget { ), ), ), - if (!controller.isEditingSourceText && controller.sourceText != null) + if ( + !controller.isEditingSourceText + && controller.sourceText != null + && controller.completedITSteps.length + < controller.goldRouteTracker.continuances.length + ) IconButton( onPressed: () => controller.setIsEditingSourceText(true), icon: const Icon(Icons.edit_outlined), From f7753a0477ddf3303c9e10071396fe93475df82c Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Sat, 8 Jun 2024 22:55:36 -0400 Subject: [PATCH 02/12] ITController Animates in --- .../controllers/it_controller.dart | 5 + lib/pangea/choreographer/widgets/it_bar.dart | 165 ++++++++++-------- 2 files changed, 95 insertions(+), 75 deletions(-) diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index 91899a71a..f29bb59b2 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -21,6 +21,7 @@ class ITController { Choreographer choreographer; bool _isOpen = false; + bool _willOpen = false; bool _isEditingSourceText = false; bool showChoiceFeedback = false; @@ -36,6 +37,7 @@ class ITController { void clear() { _isOpen = false; + _willOpen = false; showChoiceFeedback = false; _isEditingSourceText = false; @@ -54,6 +56,7 @@ class ITController { } Future initializeIT(ITStartData itStartData) async { + _willOpen = true; Future.delayed(const Duration(microseconds: 100), () { _isOpen = true; }); @@ -347,6 +350,8 @@ class ITController { bool get isOpen => _isOpen; + bool get willOpen => _willOpen; + String get targetLangCode => choreographer.l2LangCode!; String get sourceLangCode => choreographer.l1LangCode!; diff --git a/lib/pangea/choreographer/widgets/it_bar.dart b/lib/pangea/choreographer/widgets/it_bar.dart index 013c7238b..068d99166 100644 --- a/lib/pangea/choreographer/widgets/it_bar.dart +++ b/lib/pangea/choreographer/widgets/it_bar.dart @@ -7,6 +7,7 @@ import 'package:fluffychat/pangea/choreographer/widgets/it_feedback_card.dart'; import 'package:fluffychat/pangea/choreographer/widgets/translation_finished_flow.dart'; import 'package:fluffychat/pangea/constants/choreo_constants.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -21,93 +22,107 @@ class ITBar extends StatelessWidget { final Choreographer choreographer; const ITBar({super.key, required this.choreographer}); - ITController get controller => choreographer.itController; + ITController get itController => choreographer.itController; @override Widget build(BuildContext context) { - if (!controller.isOpen) return const SizedBox(); - return CompositedTransformTarget( - link: choreographer.itBarLinkAndKey.link, - child: Container( - key: choreographer.itBarLinkAndKey.key, - decoration: BoxDecoration( - color: Theme.of(context).brightness == Brightness.light - ? Colors.white - : Colors.black, - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(AppConfig.borderRadius), - topRight: Radius.circular(AppConfig.borderRadius), - ), - ), - width: double.infinity, - padding: const EdgeInsets.fromLTRB(0, 3, 3, 3), - child: Stack( - children: [ - SingleChildScrollView( - child: Column( + return AnimatedSize( + duration: itController.willOpen + ? const Duration(milliseconds: 2000) + : const Duration(milliseconds: 500), + curve: Curves.fastOutSlowIn, + clipBehavior: Clip.none, + child: !itController.willOpen + ? const SizedBox() + : CompositedTransformTarget( + link: choreographer.itBarLinkAndKey.link, + child: AnimatedOpacity( + duration: itController.willOpen + ? const Duration(milliseconds: 2000) + : const Duration(milliseconds: 500), + opacity: itController.willOpen ? 1.0 : 0.0, + child: Container( + key: choreographer.itBarLinkAndKey.key, + decoration: BoxDecoration( + color: Theme.of(context).brightness == Brightness.light + ? Colors.white + : Colors.black, + borderRadius: const BorderRadius.only( + topLeft: Radius.circular(AppConfig.borderRadius), + topRight: Radius.circular(AppConfig.borderRadius), + ), + ), + width: double.infinity, + padding: const EdgeInsets.fromLTRB(0, 3, 3, 3), + child: Stack( children: [ - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // // Row( - // // mainAxisAlignment: MainAxisAlignment.start, - // // crossAxisAlignment: CrossAxisAlignment.start, - // // children: [ - // // CounterDisplay( - // // correct: controller.correctChoices, - // // custom: controller.customChoices, - // // incorrect: controller.incorrectChoices, - // // yellow: controller.wildcardChoices, - // // ), - // // CompositedTransformTarget( - // // link: choreographer.itBotLayerLinkAndKey.link, - // // child: ITBotButton( - // // key: choreographer.itBotLayerLinkAndKey.key, - // // choreographer: choreographer, - // // ), - // // ), - // // ], - // // ), - // ITCloseButton(choreographer: choreographer), - // ], - // ), - // const SizedBox(height: 40.0), - OriginalText(controller: controller), - const SizedBox(height: 7.0), - IntrinsicHeight( - child: Container( - constraints: const BoxConstraints(minHeight: 80), - width: double.infinity, - padding: const EdgeInsets.symmetric(horizontal: 4.0), - child: Center( - child: controller.choreographer.errorService.isError - ? ITError( - error: controller + SingleChildScrollView( + child: Column( + children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // // Row( + // // mainAxisAlignment: MainAxisAlignment.start, + // // crossAxisAlignment: CrossAxisAlignment.start, + // // children: [ + // // CounterDisplay( + // // correct: controller.correctChoices, + // // custom: controller.customChoices, + // // incorrect: controller.incorrectChoices, + // // yellow: controller.wildcardChoices, + // // ), + // // CompositedTransformTarget( + // // link: choreographer.itBotLayerLinkAndKey.link, + // // child: ITBotButton( + // // key: choreographer.itBotLayerLinkAndKey.key, + // // choreographer: choreographer, + // // ), + // // ), + // // ], + // // ), + // ITCloseButton(choreographer: choreographer), + // ], + // ), + // const SizedBox(height: 40.0), + OriginalText(controller: itController), + const SizedBox(height: 7.0), + IntrinsicHeight( + child: Container( + constraints: const BoxConstraints(minHeight: 80), + width: double.infinity, + padding: const EdgeInsets.symmetric(horizontal: 4.0), + child: Center( + child: itController.choreographer.errorService.isError + ? ITError( + error: itController .choreographer.errorService.error!, - controller: controller, + controller: itController, ) - : controller.showChoiceFeedback - ? ChoiceFeedbackText(controller: controller) - : controller.isTranslationDone - ? TranslationFeedback( - controller: controller, - ) - : ITChoices(controller: controller), - ), + : itController.showChoiceFeedback + ? ChoiceFeedbackText(controller: itController) + : itController.isTranslationDone + ? TranslationFeedback( + controller: itController, + ) + : ITChoices(controller: itController), + ), + ), + ), + ], ), ), + Positioned( + top: 0.0, + right: 0.0, + child: ITCloseButton(choreographer: choreographer), + ), ], ), ), - Positioned( - top: 0.0, - right: 0.0, - child: ITCloseButton(choreographer: choreographer), - ), - ], - ), + ), ), ); } From 5a5f18bd84cdbf8ed2e636d1d1c1e3fc664a4a42 Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:21:35 -0400 Subject: [PATCH 03/12] Auto Play Interactive Translator --- assets/l10n/intl_en.arb | 12 ++- assets/l10n/intl_es.arb | 13 ++- .../controllers/choreographer.dart | 5 + .../controllers/igc_controller.dart | 5 + lib/pangea/controllers/user_controller.dart | 9 ++ lib/pangea/models/class_model.dart | 5 + lib/pangea/models/user_model.dart | 3 + .../widgets/igc/pangea_text_controller.dart | 27 ++++-- needed-translations.txt | 94 +++++++++++++++++++ 9 files changed, 162 insertions(+), 11 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index fe2a3da03..7fceca29b 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -2514,6 +2514,16 @@ "type": "text", "placeholders": {} }, + "interactiveTranslatorAutoPlaySliderHeader": "Auto Play Interactive Translator", + "@interactiveTranslatorAutoPlaySliderHeader": { + "type": "text", + "placeholders": {} + }, + "interactiveTranslatorAutoPlayDesc": "Launches the interactive translator without asking.", + "@interactiveTranslatorAutoPlayDesc": { + "type": "text", + "placeholders": {} + }, "notYetSet": "Not yet set", "@notYetSet": { "type": "text", @@ -3964,4 +3974,4 @@ "roomDataMissing": "Some data may be missing from rooms in which you are not a member.", "updatePhoneOS": "You may need to update your device's OS version.", "wordsPerMinute": "Words per minute" -} \ No newline at end of file +} diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb index d463699be..3d652ac2a 100644 --- a/assets/l10n/intl_es.arb +++ b/assets/l10n/intl_es.arb @@ -3099,6 +3099,17 @@ "type": "text", "placeholders": {} }, + "interactiveTranslatorAutoPlaySliderHeader": "Traductora interactiva de reproducción automática", + "interactiveTranslatorAutoPlay": "Traductora interactiva de reproducción automática", + "@interactiveTranslatorAutoPlay": { + "type": "text", + "placeholders": {} + }, + "interactiveTranslatorAutoPlayDesc": "Inicia el traductor interactivo sin preguntar.", + "@interactiveTranslatorAutoPlayDesc": { + "type": "text", + "placeholders": {} + }, "grammarAssistance": "Asistencia gramatical", "@grammarAssistance": { "type": "text", @@ -4652,4 +4663,4 @@ "conversationBotDiscussionZone_discussionTriggerReactionKeyLabel": "Reacción al envío del aviso de debate", "studentAnalyticsNotAvailable": "Datos de los estudiantes no disponibles actualmente", "roomDataMissing": "Es posible que falten algunos datos de las salas de las que no es miembro." -} \ No newline at end of file +} diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 3a26676c6..529ba95b4 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -513,6 +513,11 @@ class Choreographer { chatController.room, ); + bool get itAutoPlayEnabled => pangeaController.permissionsController.isToolEnabled( + ToolSetting.itAutoPlay, + chatController.room, + ); + bool get definitionsEnabled => pangeaController.permissionsController.isToolEnabled( ToolSetting.definitions, diff --git a/lib/pangea/choreographer/controllers/igc_controller.dart b/lib/pangea/choreographer/controllers/igc_controller.dart index 73694e257..6638afa3b 100644 --- a/lib/pangea/choreographer/controllers/igc_controller.dart +++ b/lib/pangea/choreographer/controllers/igc_controller.dart @@ -191,6 +191,11 @@ class IgcController { const int firstMatchIndex = 0; final PangeaMatch match = igcTextData!.matches[firstMatchIndex]; + if (match.isITStart && choreographer.itAutoPlayEnabled && igcTextData != null) { + choreographer.onITStart(igcTextData!.matches[firstMatchIndex]); + return; + } + OverlayUtil.showPositionedCard( context: context, cardToShow: SpanCard( diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index d3a17d365..0e336fdf6 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -126,6 +126,7 @@ class UserController extends BaseController { final bool? trial = migratedProfileInfo(MatrixProfile.activatedFreeTrial); final bool? interactiveTranslator = migratedProfileInfo(MatrixProfile.interactiveTranslator); + final bool? itAutoPlay = migratedProfileInfo(MatrixProfile.itAutoPlay); final bool? interactiveGrammar = migratedProfileInfo(MatrixProfile.interactiveGrammar); final bool? immersionMode = @@ -144,6 +145,7 @@ class UserController extends BaseController { autoPlayMessages: autoPlay, activatedFreeTrial: trial, interactiveTranslator: interactiveTranslator, + itAutoPlay: itAutoPlay, interactiveGrammar: interactiveGrammar, immersionMode: immersionMode, definitions: definitions, @@ -225,6 +227,7 @@ class UserController extends BaseController { bool? autoPlayMessages, bool? activatedFreeTrial, bool? interactiveTranslator, + bool? itAutoPlay, bool? interactiveGrammar, bool? immersionMode, bool? definitions, @@ -262,6 +265,12 @@ class UserController extends BaseController { interactiveTranslator, ); } + if (itAutoPlay != null) { + await _pangeaController.pStoreService.save( + MatrixProfile.itAutoPlay.title, + itAutoPlay, + ); + } if (interactiveGrammar != null) { await _pangeaController.pStoreService.save( MatrixProfile.interactiveGrammar.title, diff --git a/lib/pangea/models/class_model.dart b/lib/pangea/models/class_model.dart index 1f588980c..cf0cadedb 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/class_model.dart @@ -295,6 +295,7 @@ class PangeaRoomRules { enum ToolSetting { interactiveTranslator, + itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -306,6 +307,8 @@ extension SettingCopy on ToolSetting { switch (this) { case ToolSetting.interactiveTranslator: return L10n.of(context)!.interactiveTranslatorSliderHeader; + case ToolSetting.itAutoPlay: + return L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader; case ToolSetting.interactiveGrammar: return L10n.of(context)!.interactiveGrammarSliderHeader; case ToolSetting.immersionMode: @@ -324,6 +327,8 @@ extension SettingCopy on ToolSetting { return L10n.of(context)!.itToggleDescription; case ToolSetting.interactiveGrammar: return L10n.of(context)!.igcToggleDescription; + case ToolSetting.itAutoPlay: + return L10n.of(context)!.interactiveTranslatorAutoPlayDesc; case ToolSetting.immersionMode: return L10n.of(context)!.toggleImmersionModeDesc; case ToolSetting.definitions: diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 2169c6f70..396bcaccb 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -56,6 +56,7 @@ enum MatrixProfile { autoPlayMessages, activatedFreeTrial, interactiveTranslator, + itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -81,6 +82,8 @@ extension MatrixProfileExtension on MatrixProfile { return PLocalKey.activatedTrialKey; case MatrixProfile.interactiveTranslator: return ToolSetting.interactiveTranslator.toString(); + case MatrixProfile.itAutoPlay: + return ToolSetting.itAutoPlay.toString(); case MatrixProfile.interactiveGrammar: return ToolSetting.interactiveGrammar.toString(); case MatrixProfile.immersionMode: diff --git a/lib/pangea/widgets/igc/pangea_text_controller.dart b/lib/pangea/widgets/igc/pangea_text_controller.dart index a40e2cc15..30551463b 100644 --- a/lib/pangea/widgets/igc/pangea_text_controller.dart +++ b/lib/pangea/widgets/igc/pangea_text_controller.dart @@ -96,15 +96,24 @@ class PangeaTextController extends TextEditingController { : null; if (cardToShow != null) { - OverlayUtil.showPositionedCard( - context: context, - cardSize: matchIndex != -1 && - choreographer.igc.igcTextData!.matches[matchIndex].isITStart - ? const Size(350, 220) - : const Size(350, 400), - cardToShow: cardToShow, - transformTargetId: choreographer.inputTransformTargetKey, - ); + if ( + choreographer.itAutoPlayEnabled && + choreographer.igc.igcTextData!.matches[matchIndex].isITStart + ) { + choreographer.onITStart( + choreographer.igc.igcTextData!.matches[matchIndex], + ); + } else { + OverlayUtil.showPositionedCard( + context: context, + cardSize: matchIndex != -1 && + choreographer.igc.igcTextData!.matches[matchIndex].isITStart + ? const Size(350, 220) + : const Size(350, 400), + cardToShow: cardToShow, + transformTargetId: choreographer.inputTransformTargetKey, + ); + } } } diff --git a/needed-translations.txt b/needed-translations.txt index bb967d011..2bf77fe82 100644 --- a/needed-translations.txt +++ b/needed-translations.txt @@ -51,6 +51,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -1430,6 +1432,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -2340,6 +2344,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -3240,6 +3246,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -4140,6 +4148,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -5040,6 +5050,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -5935,6 +5947,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -6787,6 +6801,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -7687,6 +7703,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -8579,6 +8597,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -9422,6 +9442,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -10273,6 +10295,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -11173,6 +11197,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -12073,6 +12099,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -12973,6 +13001,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -13865,6 +13895,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -14716,6 +14748,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -15616,6 +15650,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -16513,6 +16549,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -17403,6 +17441,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -18817,6 +18857,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -19727,6 +19769,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -20627,6 +20671,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -21523,6 +21569,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -22412,6 +22460,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -23312,6 +23362,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -24212,6 +24264,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -25112,6 +25166,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -26012,6 +26068,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -26912,6 +26970,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -27812,6 +27872,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -28712,6 +28774,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -29608,6 +29672,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -30481,6 +30547,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -31381,6 +31449,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -32273,6 +32343,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -33124,6 +33196,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -34024,6 +34098,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -34924,6 +35000,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -35820,6 +35898,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -36689,6 +36769,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -37589,6 +37671,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -38485,6 +38569,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -39366,6 +39452,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -40217,6 +40305,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -41109,6 +41199,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -41960,6 +42052,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", From 831080198131b53e06e92c883bef9e62cf3c8a2a Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:21:35 -0400 Subject: [PATCH 04/12] Auto Play Interactive Translator --- assets/l10n/intl_en.arb | 12 ++- assets/l10n/intl_es.arb | 13 ++- .../controllers/choreographer.dart | 5 + .../controllers/igc_controller.dart | 20 +++- lib/pangea/choreographer/widgets/it_bar.dart | 18 +++- lib/pangea/controllers/user_controller.dart | 9 ++ lib/pangea/models/class_model.dart | 5 + lib/pangea/models/user_model.dart | 3 + .../widgets/igc/pangea_text_controller.dart | 37 +++++--- lib/pangea/widgets/igc/span_card.dart | 44 +++++++++ needed-translations.txt | 94 +++++++++++++++++++ 11 files changed, 241 insertions(+), 19 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index fe2a3da03..7fceca29b 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -2514,6 +2514,16 @@ "type": "text", "placeholders": {} }, + "interactiveTranslatorAutoPlaySliderHeader": "Auto Play Interactive Translator", + "@interactiveTranslatorAutoPlaySliderHeader": { + "type": "text", + "placeholders": {} + }, + "interactiveTranslatorAutoPlayDesc": "Launches the interactive translator without asking.", + "@interactiveTranslatorAutoPlayDesc": { + "type": "text", + "placeholders": {} + }, "notYetSet": "Not yet set", "@notYetSet": { "type": "text", @@ -3964,4 +3974,4 @@ "roomDataMissing": "Some data may be missing from rooms in which you are not a member.", "updatePhoneOS": "You may need to update your device's OS version.", "wordsPerMinute": "Words per minute" -} \ No newline at end of file +} diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb index d463699be..3d652ac2a 100644 --- a/assets/l10n/intl_es.arb +++ b/assets/l10n/intl_es.arb @@ -3099,6 +3099,17 @@ "type": "text", "placeholders": {} }, + "interactiveTranslatorAutoPlaySliderHeader": "Traductora interactiva de reproducción automática", + "interactiveTranslatorAutoPlay": "Traductora interactiva de reproducción automática", + "@interactiveTranslatorAutoPlay": { + "type": "text", + "placeholders": {} + }, + "interactiveTranslatorAutoPlayDesc": "Inicia el traductor interactivo sin preguntar.", + "@interactiveTranslatorAutoPlayDesc": { + "type": "text", + "placeholders": {} + }, "grammarAssistance": "Asistencia gramatical", "@grammarAssistance": { "type": "text", @@ -4652,4 +4663,4 @@ "conversationBotDiscussionZone_discussionTriggerReactionKeyLabel": "Reacción al envío del aviso de debate", "studentAnalyticsNotAvailable": "Datos de los estudiantes no disponibles actualmente", "roomDataMissing": "Es posible que falten algunos datos de las salas de las que no es miembro." -} \ No newline at end of file +} diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 3a26676c6..529ba95b4 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -513,6 +513,11 @@ class Choreographer { chatController.room, ); + bool get itAutoPlayEnabled => pangeaController.permissionsController.isToolEnabled( + ToolSetting.itAutoPlay, + chatController.room, + ); + bool get definitionsEnabled => pangeaController.permissionsController.isToolEnabled( ToolSetting.definitions, diff --git a/lib/pangea/choreographer/controllers/igc_controller.dart b/lib/pangea/choreographer/controllers/igc_controller.dart index 73694e257..07a0ac2a2 100644 --- a/lib/pangea/choreographer/controllers/igc_controller.dart +++ b/lib/pangea/choreographer/controllers/igc_controller.dart @@ -3,6 +3,7 @@ import 'dart:developer'; import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/choreographer/controllers/error_service.dart'; +import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/igc_text_data_model.dart'; import 'package:fluffychat/pangea/models/pangea_match_model.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; @@ -29,6 +30,8 @@ class IgcController { IgcController(this.choreographer); + bool turnOnAutoPlay = false; + Future getIGCTextData({required bool tokensOnly}) async { try { if (choreographer.currentText.isEmpty) return clear(); @@ -191,6 +194,15 @@ class IgcController { const int firstMatchIndex = 0; final PangeaMatch match = igcTextData!.matches[firstMatchIndex]; + if ( + match.isITStart && + choreographer.itAutoPlayEnabled && + igcTextData != null + ) { + choreographer.onITStart(igcTextData!.matches[firstMatchIndex]); + return; + } + OverlayUtil.showPositionedCard( context: context, cardToShow: SpanCard( @@ -203,6 +215,12 @@ class IgcController { ), onITStart: () { if (choreographer.itEnabled && igcTextData != null) { + if (turnOnAutoPlay) { + choreographer.pangeaController.pStoreService.save( + ToolSetting.itAutoPlay.toString(), + true, + ); + } choreographer.onITStart(igcTextData!.matches[firstMatchIndex]); } }, @@ -210,7 +228,7 @@ class IgcController { ), roomId: choreographer.roomId, ), - cardSize: match.isITStart ? const Size(350, 220) : const Size(350, 400), + cardSize: match.isITStart ? const Size(350, 260) : const Size(350, 400), transformTargetId: choreographer.inputTransformTargetKey, ); } diff --git a/lib/pangea/choreographer/widgets/it_bar.dart b/lib/pangea/choreographer/widgets/it_bar.dart index 068d99166..2ba630900 100644 --- a/lib/pangea/choreographer/widgets/it_bar.dart +++ b/lib/pangea/choreographer/widgets/it_bar.dart @@ -202,12 +202,20 @@ class OriginalText extends StatelessWidget { if ( !controller.isEditingSourceText && controller.sourceText != null - && controller.completedITSteps.length - < controller.goldRouteTracker.continuances.length ) - IconButton( - onPressed: () => controller.setIsEditingSourceText(true), - icon: const Icon(Icons.edit_outlined), + AnimatedOpacity( + duration: const Duration(milliseconds: 500), + opacity: controller.nextITStep != null + ? 1.0 + : 0.0, + child: IconButton( + onPressed: () => { + if (controller.nextITStep != null) { + controller.setIsEditingSourceText(true), + }, + }, + icon: const Icon(Icons.edit_outlined), + ), ), ], ), diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index d3a17d365..0e336fdf6 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -126,6 +126,7 @@ class UserController extends BaseController { final bool? trial = migratedProfileInfo(MatrixProfile.activatedFreeTrial); final bool? interactiveTranslator = migratedProfileInfo(MatrixProfile.interactiveTranslator); + final bool? itAutoPlay = migratedProfileInfo(MatrixProfile.itAutoPlay); final bool? interactiveGrammar = migratedProfileInfo(MatrixProfile.interactiveGrammar); final bool? immersionMode = @@ -144,6 +145,7 @@ class UserController extends BaseController { autoPlayMessages: autoPlay, activatedFreeTrial: trial, interactiveTranslator: interactiveTranslator, + itAutoPlay: itAutoPlay, interactiveGrammar: interactiveGrammar, immersionMode: immersionMode, definitions: definitions, @@ -225,6 +227,7 @@ class UserController extends BaseController { bool? autoPlayMessages, bool? activatedFreeTrial, bool? interactiveTranslator, + bool? itAutoPlay, bool? interactiveGrammar, bool? immersionMode, bool? definitions, @@ -262,6 +265,12 @@ class UserController extends BaseController { interactiveTranslator, ); } + if (itAutoPlay != null) { + await _pangeaController.pStoreService.save( + MatrixProfile.itAutoPlay.title, + itAutoPlay, + ); + } if (interactiveGrammar != null) { await _pangeaController.pStoreService.save( MatrixProfile.interactiveGrammar.title, diff --git a/lib/pangea/models/class_model.dart b/lib/pangea/models/class_model.dart index 1f588980c..cf0cadedb 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/class_model.dart @@ -295,6 +295,7 @@ class PangeaRoomRules { enum ToolSetting { interactiveTranslator, + itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -306,6 +307,8 @@ extension SettingCopy on ToolSetting { switch (this) { case ToolSetting.interactiveTranslator: return L10n.of(context)!.interactiveTranslatorSliderHeader; + case ToolSetting.itAutoPlay: + return L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader; case ToolSetting.interactiveGrammar: return L10n.of(context)!.interactiveGrammarSliderHeader; case ToolSetting.immersionMode: @@ -324,6 +327,8 @@ extension SettingCopy on ToolSetting { return L10n.of(context)!.itToggleDescription; case ToolSetting.interactiveGrammar: return L10n.of(context)!.igcToggleDescription; + case ToolSetting.itAutoPlay: + return L10n.of(context)!.interactiveTranslatorAutoPlayDesc; case ToolSetting.immersionMode: return L10n.of(context)!.toggleImmersionModeDesc; case ToolSetting.definitions: diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 2169c6f70..396bcaccb 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -56,6 +56,7 @@ enum MatrixProfile { autoPlayMessages, activatedFreeTrial, interactiveTranslator, + itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -81,6 +82,8 @@ extension MatrixProfileExtension on MatrixProfile { return PLocalKey.activatedTrialKey; case MatrixProfile.interactiveTranslator: return ToolSetting.interactiveTranslator.toString(); + case MatrixProfile.itAutoPlay: + return ToolSetting.itAutoPlay.toString(); case MatrixProfile.interactiveGrammar: return ToolSetting.interactiveGrammar.toString(); case MatrixProfile.immersionMode: diff --git a/lib/pangea/widgets/igc/pangea_text_controller.dart b/lib/pangea/widgets/igc/pangea_text_controller.dart index a40e2cc15..c476ccca0 100644 --- a/lib/pangea/widgets/igc/pangea_text_controller.dart +++ b/lib/pangea/widgets/igc/pangea_text_controller.dart @@ -82,9 +82,15 @@ class PangeaTextController extends TextEditingController { debugPrint("onSentenceRewrite $tokenIndex $sentenceRewrite"); }), onIgnore: () => choreographer.onIgnoreMatch( - cursorOffset: selection.baseOffset, - ), + cursorOffset: selection.baseOffset, + ), onITStart: () { + if (choreographer.igc.turnOnAutoPlay) { + choreographer.pangeaController.pStoreService.save( + 'ToolSetting.itAutoPlay', + true, + ); + } choreographer.onITStart( choreographer.igc.igcTextData!.matches[matchIndex], ); @@ -96,15 +102,24 @@ class PangeaTextController extends TextEditingController { : null; if (cardToShow != null) { - OverlayUtil.showPositionedCard( - context: context, - cardSize: matchIndex != -1 && - choreographer.igc.igcTextData!.matches[matchIndex].isITStart - ? const Size(350, 220) - : const Size(350, 400), - cardToShow: cardToShow, - transformTargetId: choreographer.inputTransformTargetKey, - ); + if ( + choreographer.itAutoPlayEnabled && + choreographer.igc.igcTextData!.matches[matchIndex].isITStart + ) { + choreographer.onITStart( + choreographer.igc.igcTextData!.matches[matchIndex], + ); + } else { + OverlayUtil.showPositionedCard( + context: context, + cardSize: matchIndex != -1 && + choreographer.igc.igcTextData!.matches[matchIndex].isITStart + ? const Size(350, 260) + : const Size(350, 400), + cardToShow: cardToShow, + transformTargetId: choreographer.inputTransformTargetKey, + ); + } } } diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index fd44383a0..52901bfa2 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -281,6 +281,13 @@ class WordMatchContent extends StatelessWidget { ), ], ), + if (controller.widget.scm.pangeaMatch!.isITStart) + DontShowSwitchListTile( + value: controller.widget.scm.choreographer.igc.turnOnAutoPlay, + onChanged: ((value) { + controller.widget.scm.choreographer.igc.turnOnAutoPlay = value; + }), + ), ], ); } on Exception catch (e) { @@ -419,3 +426,40 @@ class StartITButton extends StatelessWidget { ); } } + +class DontShowSwitchListTile extends StatefulWidget { + final bool value; + final ValueChanged onChanged; + + const DontShowSwitchListTile({ + super.key, + required this.value, + required this.onChanged, + }); + + @override + DontShowSwitchListTileState createState() => DontShowSwitchListTileState(); +} + +class DontShowSwitchListTileState extends State { + bool switchValue = false; + + @override + void initState() { + super.initState(); + switchValue = widget.value; + } + + @override + Widget build(BuildContext context) { + return SwitchListTile.adaptive( + activeColor: AppConfig.activeToggleColor, + title: Text(L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader), + value: switchValue, + onChanged: (value) => { + widget.onChanged(value), + setState(() => switchValue = value), + }, + ); + } +} diff --git a/needed-translations.txt b/needed-translations.txt index bb967d011..2bf77fe82 100644 --- a/needed-translations.txt +++ b/needed-translations.txt @@ -51,6 +51,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -1430,6 +1432,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -2340,6 +2344,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -3240,6 +3246,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -4140,6 +4148,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -5040,6 +5050,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -5935,6 +5947,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -6787,6 +6801,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -7687,6 +7703,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -8579,6 +8597,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -9422,6 +9442,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -10273,6 +10295,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -11173,6 +11197,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -12073,6 +12099,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -12973,6 +13001,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -13865,6 +13895,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -14716,6 +14748,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -15616,6 +15650,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -16513,6 +16549,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -17403,6 +17441,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -18817,6 +18857,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -19727,6 +19769,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -20627,6 +20671,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -21523,6 +21569,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -22412,6 +22460,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -23312,6 +23362,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -24212,6 +24264,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -25112,6 +25166,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -26012,6 +26068,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -26912,6 +26970,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -27812,6 +27872,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -28712,6 +28774,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -29608,6 +29672,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -30481,6 +30547,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -31381,6 +31449,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -32273,6 +32343,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -33124,6 +33196,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -34024,6 +34098,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -34924,6 +35000,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -35820,6 +35898,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -36689,6 +36769,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -37589,6 +37671,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -38485,6 +38569,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -39366,6 +39452,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -40217,6 +40305,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -41109,6 +41199,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", @@ -41960,6 +42052,8 @@ "interactiveTranslatorNotAllowedDesc", "interactiveTranslatorAllowedDesc", "interactiveTranslatorRequiredDesc", + "interactiveTranslatorAutoPlaySliderHeader", + "interactiveTranslatorAutoPlayDesc", "notYetSet", "multiLingualClass", "classAnalytics", From 94f87a5312af33e67e47cbf7e8b7c640fe96ff24 Mon Sep 17 00:00:00 2001 From: William Jordan-Cooley Date: Fri, 14 Jun 2024 08:38:10 -0400 Subject: [PATCH 05/12] copy edits --- assets/l10n/intl_en.arb | 14 ++++++++------ assets/l10n/intl_es.arb | 8 ++++---- lib/pangea/enum/span_data_type.dart | 7 +++++-- lib/pangea/utils/match_copy.dart | 18 +++++++++++------- lib/pangea/widgets/igc/span_card.dart | 7 ++++--- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 7fceca29b..6974d82f0 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -2514,7 +2514,7 @@ "type": "text", "placeholders": {} }, - "interactiveTranslatorAutoPlaySliderHeader": "Auto Play Interactive Translator", + "interactiveTranslatorAutoPlaySliderHeader": "Autoplay translation", "@interactiveTranslatorAutoPlaySliderHeader": { "type": "text", "placeholders": {} @@ -2884,21 +2884,23 @@ "type": "text", "placeholders": {} }, - "helpMeTranslate": "Help me translate!", + "helpMeTranslate": "Yes!", "@helpMeTranslate": { "type": "text", "placeholders": {} }, - "needsItShortMessage": "Try interactive translation!", + "needsItShortMessage": "Out of target", "needsIGCShortMessage": "Try interactive grammar assistance!", "@needsItShortMessage": { "type": "text", "placeholders": {} }, - "needsItMessage": "This message has too many words in your base language.", + "needsItMessage": "Wait, that's not {targetLanguage}! Do you need help translating?", "@needsItMessage": { "type": "text", - "placeholders": {} + "placeholders": { + "targetLanguage": {} + } }, "needsIgcMessage": "This message has a grammar error.", "tokenTranslationTitle": "A word is in your base language.", @@ -3974,4 +3976,4 @@ "roomDataMissing": "Some data may be missing from rooms in which you are not a member.", "updatePhoneOS": "You may need to update your device's OS version.", "wordsPerMinute": "Words per minute" -} +} \ No newline at end of file diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb index 3d652ac2a..819caeea0 100644 --- a/assets/l10n/intl_es.arb +++ b/assets/l10n/intl_es.arb @@ -3099,7 +3099,7 @@ "type": "text", "placeholders": {} }, - "interactiveTranslatorAutoPlaySliderHeader": "Traductora interactiva de reproducción automática", + "interactiveTranslatorAutoPlaySliderHeader": "Traducción de reproducción automática", "interactiveTranslatorAutoPlay": "Traductora interactiva de reproducción automática", "@interactiveTranslatorAutoPlay": { "type": "text", @@ -3172,10 +3172,10 @@ "translationSeemsFinished": "La traducción parece estar terminada.", "needsItShortMessage": "¡Pruebe la traducción interactiva!", "needsIGCShortMessage": "¡Pruebe el corrector gramatical interactivo!", - "needsItMessage": "Este mensaje tiene demasiadas palabras en su idioma base.", + "needsItMessage": "Espera, ¡ese no es {targetLanguage}! ¿Necesitas ayuda para traducir?", "needsIgcMessage": "Este mensaje tiene un error gramatical.", "tokenTranslationTitle": "Una palabra está en su idioma base.", - "helpMeTranslate": "¡Ayúdeme a traducir!", + "helpMeTranslate": "¡Sí!", "setToPublicSettingsTitle": "¿Quiere encontrar un compañero de conversación?", "setToPublicSettingsDesc": "Antes de que pueda buscar un compañero de conversación, debe configurar la visibilidad de su perfil como pública.", "publicProfileTitle": "Perfil público", @@ -4663,4 +4663,4 @@ "conversationBotDiscussionZone_discussionTriggerReactionKeyLabel": "Reacción al envío del aviso de debate", "studentAnalyticsNotAvailable": "Datos de los estudiantes no disponibles actualmente", "roomDataMissing": "Es posible que falten algunos datos de las salas de las que no es miembro." -} +} \ No newline at end of file diff --git a/lib/pangea/enum/span_data_type.dart b/lib/pangea/enum/span_data_type.dart index 5e4fdf8cb..949aac26b 100644 --- a/lib/pangea/enum/span_data_type.dart +++ b/lib/pangea/enum/span_data_type.dart @@ -1,5 +1,5 @@ +import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_gen/gen_l10n/l10n.dart'; enum SpanDataTypeEnum { @@ -32,7 +32,10 @@ extension SpanDataTypeEnumExt on SpanDataTypeEnum { case SpanDataTypeEnum.correction: return L10n.of(context)!.correctionDefaultPrompt; case SpanDataTypeEnum.itStart: - return L10n.of(context)!.needsItMessage; + return L10n.of(context)!.needsItMessage( + MatrixState.pangeaController.languageController.userL2?.displayName ?? + "target language", + ); } } } diff --git a/lib/pangea/utils/match_copy.dart b/lib/pangea/utils/match_copy.dart index 28080f9b5..86d784356 100644 --- a/lib/pangea/utils/match_copy.dart +++ b/lib/pangea/utils/match_copy.dart @@ -1,13 +1,13 @@ import 'dart:developer'; -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'; - import 'package:fluffychat/pangea/enum/span_data_type.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'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + import '../constants/match_rule_ids.dart'; import '../models/pangea_match_model.dart'; @@ -96,7 +96,11 @@ class MatchCopy { switch (afterColon) { case MatchRuleIds.interactiveTranslation: title = l10n.needsItShortMessage; - description = l10n.needsItMessage; + description = l10n.needsItMessage( + MatrixState + .pangeaController.languageController.userL2?.displayName ?? + "target language", + ); break; case MatchRuleIds.tokenNeedsTranslation: title = l10n.tokenTranslationTitle; diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 52901bfa2..9b9fbb4ec 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -162,6 +162,7 @@ class WordMatchContent extends StatelessWidget { try { return Column( children: [ + // if (!controller.widget.scm.pangeaMatch!.isITStart) CardHeader( text: controller.error?.toString() ?? matchCopy.title, botExpression: controller.error == null @@ -222,7 +223,7 @@ class WordMatchContent extends StatelessWidget { opacity: 0.8, child: TextButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( AppConfig.primaryColor.withOpacity(0.1), ), ), @@ -249,7 +250,7 @@ class WordMatchContent extends StatelessWidget { ? onReplaceSelected : null, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( (controller.selectedChoice != null ? controller.selectedChoice!.color : AppConfig.primaryColor) @@ -272,7 +273,7 @@ class WordMatchContent extends StatelessWidget { ); }, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( (AppConfig.primaryColor).withOpacity(0.1), ), ), From 89e726b9636073614306d65d127ea0314142bbfd Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:42:15 -0400 Subject: [PATCH 06/12] Added New Bot with Animations --- assets/pangea/bot_faces/pangea_bot.riv | Bin 0 -> 10794 bytes .../controllers/it_controller.dart | 24 ------ lib/pangea/controllers/user_controller.dart | 2 +- lib/pangea/widgets/common/bot_face_svg.dart | 78 +++++++++++++++--- pubspec.yaml | 3 +- 5 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 assets/pangea/bot_faces/pangea_bot.riv diff --git a/assets/pangea/bot_faces/pangea_bot.riv b/assets/pangea/bot_faces/pangea_bot.riv new file mode 100644 index 0000000000000000000000000000000000000000..b6956e547eeb1962304f8ad5aeec12c435307b3e GIT binary patch literal 10794 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 BTiyTw literal 0 HcmV?d00001 diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index f29bb59b2..ba14aa095 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -231,30 +231,6 @@ class ITController { _setSourceText(); getTranslationData(false); - /*sourceText = newSourceText; - final String currentText = choreographer.currentText; - - choreographer.startLoading(); - - final List responses = await Future.wait([ - _customInputTranslation(""), - _customInputTranslation(choreographer.currentText), - ]); - if (responses[0].goldContinuances != null && - responses[0].goldContinuances!.isNotEmpty) { - goldRouteTracker = GoldRouteTracker( - responses[0].goldContinuances!, - sourceText!, - ); - } - currentITStep = CurrentITStep( - sourceText: sourceText!, - currentText: currentText, - responseModel: responses[1], - storedGoldContinuances: goldRouteTracker.continuances, - ); - - _addPayloadId(responses[1]);*/ } catch (err, stack) { debugger(when: kDebugMode); if (err is! http.Response) { diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 0e336fdf6..c6a1b3409 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -142,7 +142,7 @@ class UserController extends BaseController { await updateMatrixProfile( dateOfBirth: dob, - autoPlayMessages: autoPlay, + autoPlayMessages: autoPlay ?? false, activatedFreeTrial: trial, interactiveTranslator: interactiveTranslator, itAutoPlay: itAutoPlay, diff --git a/lib/pangea/widgets/common/bot_face_svg.dart b/lib/pangea/widgets/common/bot_face_svg.dart index 718f10c90..b856596dd 100644 --- a/lib/pangea/widgets/common/bot_face_svg.dart +++ b/lib/pangea/widgets/common/bot_face_svg.dart @@ -1,8 +1,13 @@ import 'package:flutter/material.dart'; +import 'package:rive/rive.dart'; enum BotExpression { surprised, right, addled, left, down, shocked } -class BotFace extends StatelessWidget { +class BotFace extends StatefulWidget { + final double width; + final Color? forceColor; + final BotExpression expression; + const BotFace({ super.key, required this.width, @@ -10,21 +15,68 @@ class BotFace extends StatelessWidget { this.forceColor, }); - final double width; - final Color? forceColor; - final BotExpression expression; + @override + BotFaceState createState() => BotFaceState(); +} + +class BotFaceState extends State { + Artboard? _artboard; + SMINumber? _input; + + @override + void initState() { + super.initState(); + _loadRiveFile(); + } + + double mapExpressionToInput(BotExpression expression) { + switch (expression) { + case BotExpression.surprised: + return 1.0; + case BotExpression.right: + return 2.0; + case BotExpression.shocked: + return 3.0; + case BotExpression.addled: + return 4.0; + default: + return 0.0; + } + } + + Future _loadRiveFile() async { + final riveFile = await RiveFile.asset('assets/pangea/bot_faces/pangea_bot.riv'); + + final artboard = riveFile.mainArtboard; + final controller = StateMachineController + .fromArtboard(artboard, 'BotIconStateMachine'); + + if (controller != null) { + artboard.addController(controller); + _input = controller.findInput("Enter State") as SMINumber?; + controller.setInputValue( + 890, // this should be the id of the input + mapExpressionToInput(widget.expression), + ); + } + + setState(() { + _artboard = artboard; + }); + } @override Widget build(BuildContext context) { - return Image.asset( - 'assets/pangea/bot_faces/${expression.toString().split('.').last}.png', - // 'assets/pangea/bot_faces/surprised.png', - width: width, - height: width, - // color: forceColor ?? - // (Theme.of(context).brightness == Brightness.light - // ? Theme.of(context).colorScheme.primary - // : Theme.of(context).colorScheme.primary), + + return SizedBox( + width: widget.width, + height: widget.width, + child: _artboard != null + ? Rive( + artboard: _artboard!, + fit: BoxFit.cover, + ) + : Container(), ); } } diff --git a/pubspec.yaml b/pubspec.yaml index 0c3b2faac..e8d93c8d1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -124,6 +124,7 @@ dependencies: sentry_flutter: ^8.2.0 shimmer: ^3.0.0 syncfusion_flutter_xlsio: ^25.1.40 + rive: 0.11.11 # Pangea# dev_dependencies: @@ -212,4 +213,4 @@ dependency_overrides: keyboard_shortcuts: git: url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git - ref: null-safety \ No newline at end of file + ref: null-safety From 5c0763f0a9fd00eaed7dafef565519cb560a211d Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Fri, 14 Jun 2024 21:14:37 -0400 Subject: [PATCH 07/12] Finished Bot Animations and other fixes --- assets/pangea/bot_faces/pangea_bot.riv | Bin 10794 -> 10789 bytes .../controllers/igc_controller.dart | 9 ---- .../choreographer/widgets/it_bar_buttons.dart | 2 +- .../widgets/it_feedback_card.dart | 2 +- lib/pangea/controllers/user_controller.dart | 2 +- lib/pangea/utils/instructions.dart | 2 +- lib/pangea/widgets/common/bot_face_svg.dart | 32 +++++++++----- .../conversation_bot_settings.dart | 2 +- .../widgets/igc/pangea_text_controller.dart | 6 --- lib/pangea/widgets/igc/span_card.dart | 40 ++++++++++++------ lib/pangea/widgets/new_group/vocab_list.dart | 6 +-- 11 files changed, 57 insertions(+), 46 deletions(-) diff --git a/assets/pangea/bot_faces/pangea_bot.riv b/assets/pangea/bot_faces/pangea_bot.riv index b6956e547eeb1962304f8ad5aeec12c435307b3e..177b9b28fe53aa22a9bb986fbdd7a3e62dd71a09 100644 GIT binary patch delta 178 zcmZ1#vNUAFEwRma#B^9UbIE*T+svdK%)B{V&5^mD%QdegwJ5kGu_TqjvWt=3C$TcM zNWqZ7j=^y{Bg;I-34RQ2vl$scJhpj^7x=-vxj=yidyp7AiWq|fNQ`kF;|q4UItQ>A l(>%r<;&8DB2L{`zKr?KoiZL<*H32!y4E7+31w^ni0051&D{KG& delta 186 zcmZ1)vMOZ5Eip#x%{Rq#S(&UEH?zrnV*}BDl!BQ-w7;4ob3M0fUP)?^LU2i9Nh*V7 z7bCk*VkMAo$l$ getIGCTextData({required bool tokensOnly}) async { try { if (choreographer.currentText.isEmpty) return clear(); @@ -215,12 +212,6 @@ class IgcController { ), onITStart: () { if (choreographer.itEnabled && igcTextData != null) { - if (turnOnAutoPlay) { - choreographer.pangeaController.pStoreService.save( - ToolSetting.itAutoPlay.toString(), - true, - ); - } choreographer.onITStart(igcTextData!.matches[firstMatchIndex]); } }, diff --git a/lib/pangea/choreographer/widgets/it_bar_buttons.dart b/lib/pangea/choreographer/widgets/it_bar_buttons.dart index 815020d17..786c17c07 100644 --- a/lib/pangea/choreographer/widgets/it_bar_buttons.dart +++ b/lib/pangea/choreographer/widgets/it_bar_buttons.dart @@ -45,7 +45,7 @@ class ITBotButton extends StatelessWidget { ); return IconButton( - icon: const BotFace(width: 40.0, expression: BotExpression.right), + icon: const BotFace(width: 40.0, expression: BotExpression.idle), onPressed: () => choreographer.pangeaController.instructions.show( context, InstructionsEnum.itInstructions, diff --git a/lib/pangea/choreographer/widgets/it_feedback_card.dart b/lib/pangea/choreographer/widgets/it_feedback_card.dart index 072d24e1a..5424310a8 100644 --- a/lib/pangea/choreographer/widgets/it_feedback_card.dart +++ b/lib/pangea/choreographer/widgets/it_feedback_card.dart @@ -129,7 +129,7 @@ class ITFeedbackCardView extends StatelessWidget { children: [ CardHeader( text: controller.widget.req.chosenContinuance, - botExpression: BotExpression.down, + botExpression: BotExpression.nonGold, ), Text( controller.widget.choiceFeedback, diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index c6a1b3409..0e336fdf6 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -142,7 +142,7 @@ class UserController extends BaseController { await updateMatrixProfile( dateOfBirth: dob, - autoPlayMessages: autoPlay ?? false, + autoPlayMessages: autoPlay, activatedFreeTrial: trial, interactiveTranslator: interactiveTranslator, itAutoPlay: itAutoPlay, diff --git a/lib/pangea/utils/instructions.dart b/lib/pangea/utils/instructions.dart index f1fa8b59f..7d3711ae6 100644 --- a/lib/pangea/utils/instructions.dart +++ b/lib/pangea/utils/instructions.dart @@ -73,7 +73,7 @@ class InstructionsController { children: [ CardHeader( text: key.title(context), - botExpression: BotExpression.surprised, + botExpression: BotExpression.idle, onClose: () => {_instructionsClosed[key] = true}, ), const SizedBox(height: 10.0), diff --git a/lib/pangea/widgets/common/bot_face_svg.dart b/lib/pangea/widgets/common/bot_face_svg.dart index b856596dd..f387b4bc3 100644 --- a/lib/pangea/widgets/common/bot_face_svg.dart +++ b/lib/pangea/widgets/common/bot_face_svg.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rive/rive.dart'; -enum BotExpression { surprised, right, addled, left, down, shocked } +enum BotExpression { gold, nonGold, addled, idle, surprised } class BotFace extends StatefulWidget { final double width; @@ -21,7 +21,7 @@ class BotFace extends StatefulWidget { class BotFaceState extends State { Artboard? _artboard; - SMINumber? _input; + StateMachineController? _controller; @override void initState() { @@ -31,11 +31,11 @@ class BotFaceState extends State { double mapExpressionToInput(BotExpression expression) { switch (expression) { - case BotExpression.surprised: + case BotExpression.gold: return 1.0; - case BotExpression.right: + case BotExpression.nonGold: return 2.0; - case BotExpression.shocked: + case BotExpression.surprised: return 3.0; case BotExpression.addled: return 4.0; @@ -48,14 +48,13 @@ class BotFaceState extends State { final riveFile = await RiveFile.asset('assets/pangea/bot_faces/pangea_bot.riv'); final artboard = riveFile.mainArtboard; - final controller = StateMachineController + _controller = StateMachineController .fromArtboard(artboard, 'BotIconStateMachine'); - if (controller != null) { - artboard.addController(controller); - _input = controller.findInput("Enter State") as SMINumber?; - controller.setInputValue( - 890, // this should be the id of the input + if (_controller != null) { + artboard.addController(_controller!); + _controller!.setInputValue( + _controller!.stateMachine.inputs[0].id, mapExpressionToInput(widget.expression), ); } @@ -79,6 +78,17 @@ class BotFaceState extends State { : Container(), ); } + + @override + void didUpdateWidget(BotFace oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.expression != widget.expression) { + _controller!.setInputValue( + _controller!.stateMachine.inputs[0].id, + mapExpressionToInput(widget.expression), + ); + } + } } // extension ParseToString on BotExpressions { diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart index d10fd6980..7e242b706 100644 --- a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart +++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart @@ -142,7 +142,7 @@ class ConversationBotSettingsState extends State { Theme.of(context).textTheme.bodyLarge!.color, child: const BotFace( width: 30.0, - expression: BotExpression.right, + expression: BotExpression.idle, ), ), activeColor: AppConfig.activeToggleColor, diff --git a/lib/pangea/widgets/igc/pangea_text_controller.dart b/lib/pangea/widgets/igc/pangea_text_controller.dart index c476ccca0..adecb4f00 100644 --- a/lib/pangea/widgets/igc/pangea_text_controller.dart +++ b/lib/pangea/widgets/igc/pangea_text_controller.dart @@ -85,12 +85,6 @@ class PangeaTextController extends TextEditingController { cursorOffset: selection.baseOffset, ), onITStart: () { - if (choreographer.igc.turnOnAutoPlay) { - choreographer.pangeaController.pStoreService.save( - 'ToolSetting.itAutoPlay', - true, - ); - } choreographer.onITStart( choreographer.igc.igcTextData!.matches[matchIndex], ); diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 9b9fbb4ec..3d6df9928 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -15,6 +15,7 @@ import '../../../widgets/matrix.dart'; import '../../choreographer/widgets/choice_array.dart'; import '../../controllers/pangea_controller.dart'; import '../../enum/span_choice_type.dart'; +import '../../models/class_model.dart'; import '../../models/span_card_model.dart'; import '../common/bot_face_svg.dart'; import 'card_header.dart'; @@ -49,6 +50,8 @@ class SpanCardState extends State { bool fetchingData = false; int? selectedChoiceIndex; + BotExpression currentExpression = BotExpression.nonGold; + //on initState, get SpanDetails @override void initState() { @@ -121,7 +124,23 @@ class WordMatchContent extends StatelessWidget { .choices?[index] .selected = true; - controller.setState(() => ()); + controller.setState( + () => ( + controller.currentExpression = + controller + .widget + .scm + .choreographer + .igc + .igcTextData + !.matches[controller.widget.scm.matchIndex] + .match + .choices![index] + .isBestCorrection + ? BotExpression.gold + : BotExpression.nonGold + ), + ); // if (controller.widget.scm.pangeaMatch.match.choices![index].type == // SpanChoiceType.distractor) { // await controller.getSpanDetails(); @@ -166,7 +185,7 @@ class WordMatchContent extends StatelessWidget { CardHeader( text: controller.error?.toString() ?? matchCopy.title, botExpression: controller.error == null - ? BotExpression.right + ? controller.currentExpression : BotExpression.addled, ), Expanded( @@ -284,10 +303,7 @@ class WordMatchContent extends StatelessWidget { ), if (controller.widget.scm.pangeaMatch!.isITStart) DontShowSwitchListTile( - value: controller.widget.scm.choreographer.igc.turnOnAutoPlay, - onChanged: ((value) { - controller.widget.scm.choreographer.igc.turnOnAutoPlay = value; - }), + controller: pangeaController, ), ], ); @@ -429,13 +445,11 @@ class StartITButton extends StatelessWidget { } class DontShowSwitchListTile extends StatefulWidget { - final bool value; - final ValueChanged onChanged; + final PangeaController controller; const DontShowSwitchListTile({ super.key, - required this.value, - required this.onChanged, + required this.controller, }); @override @@ -448,7 +462,6 @@ class DontShowSwitchListTileState extends State { @override void initState() { super.initState(); - switchValue = widget.value; } @override @@ -458,7 +471,10 @@ class DontShowSwitchListTileState extends State { title: Text(L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader), value: switchValue, onChanged: (value) => { - widget.onChanged(value), + widget.controller.pStoreService.save( + ToolSetting.itAutoPlay.toString(), + value, + ), setState(() => switchValue = value), }, ); diff --git a/lib/pangea/widgets/new_group/vocab_list.dart b/lib/pangea/widgets/new_group/vocab_list.dart index e6c2675e4..240e99a85 100644 --- a/lib/pangea/widgets/new_group/vocab_list.dart +++ b/lib/pangea/widgets/new_group/vocab_list.dart @@ -271,7 +271,7 @@ class GenerateVocabButtonState extends State { ElevatedButton.icon( icon: const BotFace( width: 50.0, - expression: BotExpression.right, + expression: BotExpression.idle, ), label: Text(L10n.of(context)!.generateVocabulary), onPressed: () async { @@ -464,9 +464,9 @@ class PromptsFieldState extends State { // button to call API ElevatedButton.icon( - icon: const BotFace( + icon: BotFace( width: 50.0, - expression: BotExpression.right, + expression: BotExpression.idle, ), label: Text(L10n.of(context)!.generatePrompts), onPressed: () async { From 929909a000f61175a753b3ac1e6c7efbc0192da1 Mon Sep 17 00:00:00 2001 From: William Jordan-Cooley Date: Tue, 18 Jun 2024 12:10:49 -0400 Subject: [PATCH 08/12] little code cleanup --- .../widgets/igc/pangea_text_controller.dart | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/lib/pangea/widgets/igc/pangea_text_controller.dart b/lib/pangea/widgets/igc/pangea_text_controller.dart index adecb4f00..b91186c22 100644 --- a/lib/pangea/widgets/igc/pangea_text_controller.dart +++ b/lib/pangea/widgets/igc/pangea_text_controller.dart @@ -71,6 +71,16 @@ class PangeaTextController extends TextEditingController { choreographer.igc.igcTextData!.getTopMatchIndexForOffset( selection.baseOffset, ); + + // if autoplay on and it start then just start it + if (matchIndex != -1 && + choreographer.itAutoPlayEnabled && + choreographer.igc.igcTextData!.matches[matchIndex].isITStart) { + return choreographer.onITStart( + choreographer.igc.igcTextData!.matches[matchIndex], + ); + } + final Widget? cardToShow = matchIndex != -1 ? SpanCard( scm: SpanCardModel( @@ -82,8 +92,8 @@ class PangeaTextController extends TextEditingController { debugPrint("onSentenceRewrite $tokenIndex $sentenceRewrite"); }), onIgnore: () => choreographer.onIgnoreMatch( - cursorOffset: selection.baseOffset, - ), + cursorOffset: selection.baseOffset, + ), onITStart: () { choreographer.onITStart( choreographer.igc.igcTextData!.matches[matchIndex], @@ -96,24 +106,15 @@ class PangeaTextController extends TextEditingController { : null; if (cardToShow != null) { - if ( - choreographer.itAutoPlayEnabled && - choreographer.igc.igcTextData!.matches[matchIndex].isITStart - ) { - choreographer.onITStart( - choreographer.igc.igcTextData!.matches[matchIndex], - ); - } else { - OverlayUtil.showPositionedCard( - context: context, - cardSize: matchIndex != -1 && - choreographer.igc.igcTextData!.matches[matchIndex].isITStart - ? const Size(350, 260) - : const Size(350, 400), - cardToShow: cardToShow, - transformTargetId: choreographer.inputTransformTargetKey, - ); - } + OverlayUtil.showPositionedCard( + context: context, + cardSize: matchIndex != -1 && + choreographer.igc.igcTextData!.matches[matchIndex].isITStart + ? const Size(350, 260) + : const Size(350, 400), + cardToShow: cardToShow, + transformTargetId: choreographer.inputTransformTargetKey, + ); } } From 90adf436d31d29fbaa2005da3bbb8532bf7f6f8d Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:29:44 -0400 Subject: [PATCH 09/12] Choice quick click bug fixed 343 --- assets/pangea/bot_faces/pangea_bot.riv | Bin 10789 -> 11187 bytes lib/pages/chat/chat_input_row.dart | 4 - lib/pages/chat/chat_view.dart | 4 + .../choreographer/widgets/choice_array.dart | 97 ++++++++++++++---- lib/pangea/controllers/local_settings.dart | 3 +- lib/pangea/widgets/igc/span_card.dart | 2 +- 6 files changed, 83 insertions(+), 27 deletions(-) diff --git a/assets/pangea/bot_faces/pangea_bot.riv b/assets/pangea/bot_faces/pangea_bot.riv index 177b9b28fe53aa22a9bb986fbdd7a3e62dd71a09..94244a30f977bc7fadbcec98932ba3bff200374d 100644 GIT binary patch delta 533 zcmZ1)vN?RiIk8Yl<6H(QQ(gu+7e=@9zR4Cq4j-6P$GX9ULDIMaE}M1klsQ~>0V9(c zkRt$A%D~WI59A2KIh)Ult!3i#g{zjZb#mHVE*Z?p4zvZtnS4S?l}1*-QPN@7LA4s_ z4LqKl?5Uz+K&nSKo2n%;P2MfWHF>&*7Hxbo`GCglz#c{h1_uWQ%PvNCpTx@4A_YSR zdj{L7Kv5vU3?f)T1Pg;5gX45Yrg@AL{21J31EqmHmU)a9_`$rnKmlMB0mYanU(i&S TV4ughLmVOFz~BHfgpmONzpMoNT46%q(xtH91FJV)Hp=0cOVB$^5D+o72=InI@mm z)Sm3Ab<32&vWt=3C$TcMNWqZ7j=^y{Bg;I-34RQ2vl$scJhpj^7x=-vxj=yidyp9W l? choices; final void Function(int) onPressed; @@ -18,6 +17,7 @@ class ChoicesArray extends StatelessWidget { final int? selectedChoiceIndex; final String originalSpan; final String Function(int) uniqueKeyForLayerLink; + const ChoicesArray({ super.key, required this.isLoading, @@ -29,23 +29,49 @@ class ChoicesArray extends StatelessWidget { this.onLongPress, }); + @override + ChoicesArrayState createState() => ChoicesArrayState(); +} + +class ChoicesArrayState extends State { + bool interactionDisabled = false; + + void disableInteraction() { + WidgetsBinding.instance.addPostFrameCallback((_) { + setState(() { + interactionDisabled = true; + }); + }); + } + + void enableInteractions() { + WidgetsBinding.instance.addPostFrameCallback((_) { + setState(() { + interactionDisabled = false; + }); + }); + } + @override Widget build(BuildContext context) { final ThemeData theme = Theme.of(context); - return isLoading && (choices == null || choices!.length <= 1) - ? ItShimmer(originalSpan: originalSpan) + return widget.isLoading && (widget.choices == null || widget.choices!.length <= 1) + ? ItShimmer(originalSpan: widget.originalSpan) : Wrap( alignment: WrapAlignment.center, - children: choices + children: widget.choices ?.asMap() .entries .map( (entry) => ChoiceItem( theme: theme, - onLongPress: onLongPress, - onPressed: onPressed, + onLongPress: widget.onLongPress, + onPressed: widget.onPressed, entry: entry, - isSelected: selectedChoiceIndex == entry.key, + interactionDisabled: interactionDisabled, + enableInteraction: enableInteractions, + disableInteraction: disableInteraction, + isSelected: widget.selectedChoiceIndex == entry.key, ), ) .toList() ?? @@ -74,6 +100,9 @@ class ChoiceItem extends StatelessWidget { required this.onPressed, required this.entry, required this.isSelected, + required this.interactionDisabled, + required this.enableInteraction, + required this.disableInteraction, }); final MapEntry entry; @@ -81,6 +110,9 @@ class ChoiceItem extends StatelessWidget { final void Function(int p1)? onLongPress; final void Function(int p1) onPressed; final bool isSelected; + final bool interactionDisabled; + final VoidCallback enableInteraction; + final VoidCallback disableInteraction; @override Widget build(BuildContext context) { @@ -94,6 +126,8 @@ class ChoiceItem extends StatelessWidget { key: ValueKey(entry.value.text), selected: entry.value.color != null, isGold: entry.value.isGold, + enableInteraction: enableInteraction, + disableInteraction: disableInteraction, child: Container( margin: const EdgeInsets.all(2), padding: EdgeInsets.zero, @@ -128,8 +162,9 @@ class ChoiceItem extends StatelessWidget { ), ), onLongPress: - onLongPress != null ? () => onLongPress!(entry.key) : null, - onPressed: () => onPressed(entry.key), + onLongPress != null && !interactionDisabled + ? () => onLongPress!(entry.key) : null, + onPressed: interactionDisabled ? null : () => onPressed(entry.key), child: Text( entry.value.text, style: BotStyle.text(context), @@ -149,11 +184,15 @@ class ChoiceAnimationWidget extends StatefulWidget { final Widget child; final bool selected; final bool isGold; + final VoidCallback enableInteraction; + final VoidCallback disableInteraction; const ChoiceAnimationWidget({ super.key, required this.child, required this.selected, + required this.enableInteraction, + required this.disableInteraction, this.isGold = false, }); @@ -161,11 +200,13 @@ class ChoiceAnimationWidget extends StatefulWidget { ChoiceAnimationWidgetState createState() => ChoiceAnimationWidgetState(); } +enum AnimationState { ready, forward, reverse, finished } + class ChoiceAnimationWidgetState extends State with SingleTickerProviderStateMixin { late final AnimationController _controller; late final Animation _animation; - bool animationPlayed = false; + AnimationState animationState = AnimationState.ready; @override void initState() { @@ -193,17 +234,29 @@ class ChoiceAnimationWidgetState extends State ), ]).animate(_controller); - if (widget.selected && !animationPlayed) { + widget.enableInteraction(); + + if (widget.selected && animationState == AnimationState.ready) { + widget.disableInteraction(); _controller.forward(); - animationPlayed = true; - setState(() {}); + setState(() { + animationState = AnimationState.forward; + }); } _controller.addStatusListener((status) { - if (status == AnimationStatus.completed) { + if (status == AnimationStatus.completed && + animationState == AnimationState.forward) { _controller.reverse(); - } else if (status == AnimationStatus.dismissed) { - _controller.stop(); - _controller.reset(); + setState(() { + animationState = AnimationState.reverse; + }); + } + if (status == AnimationStatus.dismissed && + animationState == AnimationState.reverse) { + widget.enableInteraction(); + setState(() { + animationState = AnimationState.finished; + }); } }); } @@ -211,10 +264,12 @@ class ChoiceAnimationWidgetState extends State @override void didUpdateWidget(ChoiceAnimationWidget oldWidget) { super.didUpdateWidget(oldWidget); - if (widget.selected && !animationPlayed) { + if (widget.selected && animationState == AnimationState.ready) { + widget.disableInteraction(); _controller.forward(); - animationPlayed = true; - setState(() {}); + setState(() { + animationState = AnimationState.forward; + }); } } diff --git a/lib/pangea/controllers/local_settings.dart b/lib/pangea/controllers/local_settings.dart index 5984a7bf5..d6ae119a5 100644 --- a/lib/pangea/controllers/local_settings.dart +++ b/lib/pangea/controllers/local_settings.dart @@ -9,7 +9,8 @@ class LocalSettings { } bool userLanguageToolSetting(ToolSetting setting) => - _pangeaController.pStoreService.read(setting.toString()) ?? true; + _pangeaController.pStoreService.read(setting.toString()) + ?? setting != ToolSetting.itAutoPlay; // bool get userEnableIT => // _pangeaController.pStoreService.read(ToolSetting.interactiveTranslator.toString()) ?? true; diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 3d6df9928..75738a687 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -138,7 +138,7 @@ class WordMatchContent extends StatelessWidget { .choices![index] .isBestCorrection ? BotExpression.gold - : BotExpression.nonGold + : BotExpression.surprised ), ); // if (controller.widget.scm.pangeaMatch.match.choices![index].type == From 50dc34bd94166e125a8c41720562722a83db4f05 Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Thu, 20 Jun 2024 22:20:47 -0400 Subject: [PATCH 10/12] itAutoPlay added to setting switches --- lib/pangea/enum/span_data_type.dart | 2 +- lib/pangea/models/class_model.dart | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/pangea/enum/span_data_type.dart b/lib/pangea/enum/span_data_type.dart index 949aac26b..38315fd50 100644 --- a/lib/pangea/enum/span_data_type.dart +++ b/lib/pangea/enum/span_data_type.dart @@ -34,7 +34,7 @@ extension SpanDataTypeEnumExt on SpanDataTypeEnum { case SpanDataTypeEnum.itStart: return L10n.of(context)!.needsItMessage( MatrixState.pangeaController.languageController.userL2?.displayName ?? - "target language", + L10n.of(context)!.targetLanguage, ); } } diff --git a/lib/pangea/models/class_model.dart b/lib/pangea/models/class_model.dart index cf0cadedb..f663af8ce 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/class_model.dart @@ -120,6 +120,7 @@ class PangeaRoomRules { bool isInviteOnlyStudents; // 0 = forbidden, 1 = allow individual to choose, 2 = require int interactiveTranslator; + int itAutoPlay; int interactiveGrammar; int immersionMode; int definitions; @@ -138,6 +139,7 @@ class PangeaRoomRules { this.isVoiceNotes = true, this.isInviteOnlyStudents = true, this.interactiveTranslator = ClassDefaultValues.languageToolPermissions, + this.itAutoPlay = ClassDefaultValues.languageToolPermissions, this.interactiveGrammar = ClassDefaultValues.languageToolPermissions, this.immersionMode = ClassDefaultValues.languageToolPermissions, this.definitions = ClassDefaultValues.languageToolPermissions, @@ -189,6 +191,9 @@ class PangeaRoomRules { case ToolSetting.interactiveTranslator: interactiveTranslator = value; break; + case ToolSetting.itAutoPlay: + itAutoPlay = value; + break; case ToolSetting.interactiveGrammar: interactiveGrammar = value; break; @@ -227,6 +232,8 @@ class PangeaRoomRules { isInviteOnlyStudents: json['is_invite_only_students'] ?? true, interactiveTranslator: json['interactive_translator'] ?? ClassDefaultValues.languageToolPermissions, + itAutoPlay: json['it_auto_play'] ?? + ClassDefaultValues.languageToolPermissions, interactiveGrammar: json['interactive_grammar'] ?? ClassDefaultValues.languageToolPermissions, immersionMode: json['immersion_mode'] ?? @@ -252,6 +259,7 @@ class PangeaRoomRules { data['is_voice_notes'] = isVoiceNotes; data['is_invite_only_students'] = isInviteOnlyStudents; data['interactive_translator'] = interactiveTranslator; + data['it_auto_play'] = itAutoPlay; data['interactive_grammar'] = interactiveGrammar; data['immersion_mode'] = immersionMode; data['definitions'] = definitions; @@ -263,6 +271,8 @@ class PangeaRoomRules { switch (setting) { case ToolSetting.interactiveTranslator: return interactiveTranslator; + case ToolSetting.itAutoPlay: + return itAutoPlay; case ToolSetting.interactiveGrammar: return interactiveGrammar; case ToolSetting.immersionMode: From 47dbe6dfd308658d4a5b09b241288bab52bfb90a Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:21:57 -0400 Subject: [PATCH 11/12] itAutoPlay moved from ToolSettings to PLocalKey --- .../controllers/choreographer.dart | 6 +-- lib/pangea/constants/local.key.dart | 1 + lib/pangea/controllers/local_settings.dart | 3 +- lib/pangea/controllers/user_controller.dart | 18 +++---- lib/pangea/models/class_model.dart | 51 +++++++------------ lib/pangea/models/user_model.dart | 6 +-- .../settings_learning_view.dart | 10 ++++ lib/pangea/widgets/igc/span_card.dart | 4 +- 8 files changed, 47 insertions(+), 52 deletions(-) diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 529ba95b4..ce6dbb04f 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -15,6 +15,7 @@ import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/it_step.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/overlay.dart'; @@ -513,9 +514,8 @@ class Choreographer { chatController.room, ); - bool get itAutoPlayEnabled => pangeaController.permissionsController.isToolEnabled( - ToolSetting.itAutoPlay, - chatController.room, + bool get itAutoPlayEnabled => pangeaController.pStoreService.read( + MatrixProfile.itAutoPlay.title, ); bool get definitionsEnabled => diff --git a/lib/pangea/constants/local.key.dart b/lib/pangea/constants/local.key.dart index c0390c2ba..8dc496bf8 100644 --- a/lib/pangea/constants/local.key.dart +++ b/lib/pangea/constants/local.key.dart @@ -11,4 +11,5 @@ class PLocalKey { static const String dismissedPaywall = 'dismissedPaywall'; static const String paywallBackoff = 'paywallBackoff'; static const String autoPlayMessages = 'autoPlayMessages'; + static const String itAutoPlay = 'itAutoPlay'; } diff --git a/lib/pangea/controllers/local_settings.dart b/lib/pangea/controllers/local_settings.dart index d6ae119a5..5984a7bf5 100644 --- a/lib/pangea/controllers/local_settings.dart +++ b/lib/pangea/controllers/local_settings.dart @@ -9,8 +9,7 @@ class LocalSettings { } bool userLanguageToolSetting(ToolSetting setting) => - _pangeaController.pStoreService.read(setting.toString()) - ?? setting != ToolSetting.itAutoPlay; + _pangeaController.pStoreService.read(setting.toString()) ?? true; // bool get userEnableIT => // _pangeaController.pStoreService.read(ToolSetting.interactiveTranslator.toString()) ?? true; diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 0e336fdf6..31cde897f 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -123,10 +123,10 @@ class UserController extends BaseController { : null; final bool? autoPlay = migratedProfileInfo(MatrixProfile.autoPlayMessages); + final bool? itAutoPlay = migratedProfileInfo(MatrixProfile.itAutoPlay); final bool? trial = migratedProfileInfo(MatrixProfile.activatedFreeTrial); final bool? interactiveTranslator = migratedProfileInfo(MatrixProfile.interactiveTranslator); - final bool? itAutoPlay = migratedProfileInfo(MatrixProfile.itAutoPlay); final bool? interactiveGrammar = migratedProfileInfo(MatrixProfile.interactiveGrammar); final bool? immersionMode = @@ -143,9 +143,9 @@ class UserController extends BaseController { await updateMatrixProfile( dateOfBirth: dob, autoPlayMessages: autoPlay, + itAutoPlay: itAutoPlay, activatedFreeTrial: trial, interactiveTranslator: interactiveTranslator, - itAutoPlay: itAutoPlay, interactiveGrammar: interactiveGrammar, immersionMode: immersionMode, definitions: definitions, @@ -225,9 +225,9 @@ class UserController extends BaseController { Future updateMatrixProfile({ String? dateOfBirth, bool? autoPlayMessages, + bool? itAutoPlay, bool? activatedFreeTrial, bool? interactiveTranslator, - bool? itAutoPlay, bool? interactiveGrammar, bool? immersionMode, bool? definitions, @@ -253,6 +253,12 @@ class UserController extends BaseController { autoPlayMessages, ); } + if (itAutoPlay != null) { + await _pangeaController.pStoreService.save( + MatrixProfile.itAutoPlay.title, + itAutoPlay, + ); + } if (activatedFreeTrial != null) { await _pangeaController.pStoreService.save( MatrixProfile.activatedFreeTrial.title, @@ -265,12 +271,6 @@ class UserController extends BaseController { interactiveTranslator, ); } - if (itAutoPlay != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.itAutoPlay.title, - itAutoPlay, - ); - } if (interactiveGrammar != null) { await _pangeaController.pStoreService.save( MatrixProfile.interactiveGrammar.title, diff --git a/lib/pangea/models/class_model.dart b/lib/pangea/models/class_model.dart index f663af8ce..0bebdac2f 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/class_model.dart @@ -31,13 +31,13 @@ class ClassSettingsModel { }); static ClassSettingsModel get newClass => ClassSettingsModel( - city: null, - country: null, - dominantLanguage: ClassDefaultValues.defaultDominantLanguage, - languageLevel: null, - schoolName: null, - targetLanguage: ClassDefaultValues.defaultTargetLanguage, - ); + city: null, + country: null, + dominantLanguage: ClassDefaultValues.defaultDominantLanguage, + languageLevel: null, + schoolName: null, + targetLanguage: ClassDefaultValues.defaultTargetLanguage, + ); factory ClassSettingsModel.fromJson(Map json) { return ClassSettingsModel( @@ -100,9 +100,9 @@ class ClassSettingsModel { } StateEvent get toStateEvent => StateEvent( - content: toJson(), - type: PangeaEventTypes.classSettings, - ); + content: toJson(), + type: PangeaEventTypes.classSettings, + ); } class PangeaRoomRules { @@ -120,7 +120,6 @@ class PangeaRoomRules { bool isInviteOnlyStudents; // 0 = forbidden, 1 = allow individual to choose, 2 = require int interactiveTranslator; - int itAutoPlay; int interactiveGrammar; int immersionMode; int definitions; @@ -139,7 +138,6 @@ class PangeaRoomRules { this.isVoiceNotes = true, this.isInviteOnlyStudents = true, this.interactiveTranslator = ClassDefaultValues.languageToolPermissions, - this.itAutoPlay = ClassDefaultValues.languageToolPermissions, this.interactiveGrammar = ClassDefaultValues.languageToolPermissions, this.immersionMode = ClassDefaultValues.languageToolPermissions, this.definitions = ClassDefaultValues.languageToolPermissions, @@ -191,9 +189,6 @@ class PangeaRoomRules { case ToolSetting.interactiveTranslator: interactiveTranslator = value; break; - case ToolSetting.itAutoPlay: - itAutoPlay = value; - break; case ToolSetting.interactiveGrammar: interactiveGrammar = value; break; @@ -212,9 +207,9 @@ class PangeaRoomRules { } StateEvent get toStateEvent => StateEvent( - content: toJson(), - type: PangeaEventTypes.rules, - ); + content: toJson(), + type: PangeaEventTypes.rules, + ); factory PangeaRoomRules.fromJson(Map json) => PangeaRoomRules( @@ -232,16 +227,14 @@ class PangeaRoomRules { isInviteOnlyStudents: json['is_invite_only_students'] ?? true, interactiveTranslator: json['interactive_translator'] ?? ClassDefaultValues.languageToolPermissions, - itAutoPlay: json['it_auto_play'] ?? - ClassDefaultValues.languageToolPermissions, interactiveGrammar: json['interactive_grammar'] ?? ClassDefaultValues.languageToolPermissions, immersionMode: json['immersion_mode'] ?? ClassDefaultValues.languageToolPermissions, definitions: - json['definitions'] ?? ClassDefaultValues.languageToolPermissions, + json['definitions'] ?? ClassDefaultValues.languageToolPermissions, translations: - json['translations'] ?? ClassDefaultValues.languageToolPermissions, + json['translations'] ?? ClassDefaultValues.languageToolPermissions, ); Map toJson() { @@ -259,7 +252,6 @@ class PangeaRoomRules { data['is_voice_notes'] = isVoiceNotes; data['is_invite_only_students'] = isInviteOnlyStudents; data['interactive_translator'] = interactiveTranslator; - data['it_auto_play'] = itAutoPlay; data['interactive_grammar'] = interactiveGrammar; data['immersion_mode'] = immersionMode; data['definitions'] = definitions; @@ -271,8 +263,6 @@ class PangeaRoomRules { switch (setting) { case ToolSetting.interactiveTranslator: return interactiveTranslator; - case ToolSetting.itAutoPlay: - return itAutoPlay; case ToolSetting.interactiveGrammar: return interactiveGrammar; case ToolSetting.immersionMode: @@ -287,9 +277,9 @@ class PangeaRoomRules { } String languageToolPermissionsText( - BuildContext context, - ToolSetting setting, - ) { + BuildContext context, + ToolSetting setting, + ) { switch (getToolSettings(setting)) { case 0: return L10n.of(context)!.interactiveTranslatorNotAllowed; @@ -305,7 +295,6 @@ class PangeaRoomRules { enum ToolSetting { interactiveTranslator, - itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -317,8 +306,6 @@ extension SettingCopy on ToolSetting { switch (this) { case ToolSetting.interactiveTranslator: return L10n.of(context)!.interactiveTranslatorSliderHeader; - case ToolSetting.itAutoPlay: - return L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader; case ToolSetting.interactiveGrammar: return L10n.of(context)!.interactiveGrammarSliderHeader; case ToolSetting.immersionMode: @@ -337,8 +324,6 @@ extension SettingCopy on ToolSetting { return L10n.of(context)!.itToggleDescription; case ToolSetting.interactiveGrammar: return L10n.of(context)!.igcToggleDescription; - case ToolSetting.itAutoPlay: - return L10n.of(context)!.interactiveTranslatorAutoPlayDesc; case ToolSetting.immersionMode: return L10n.of(context)!.toggleImmersionModeDesc; case ToolSetting.definitions: diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 396bcaccb..3721da95c 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -54,9 +54,9 @@ class PUserModel { enum MatrixProfile { dateOfBirth, autoPlayMessages, + itAutoPlay, activatedFreeTrial, interactiveTranslator, - itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -78,12 +78,12 @@ extension MatrixProfileExtension on MatrixProfile { return ModelKey.userDateOfBirth; case MatrixProfile.autoPlayMessages: return PLocalKey.autoPlayMessages; + case MatrixProfile.itAutoPlay: + return PLocalKey.itAutoPlay; case MatrixProfile.activatedFreeTrial: return PLocalKey.activatedTrialKey; case MatrixProfile.interactiveTranslator: return ToolSetting.interactiveTranslator.toString(); - case MatrixProfile.itAutoPlay: - return ToolSetting.itAutoPlay.toString(); case MatrixProfile.interactiveGrammar: return ToolSetting.interactiveGrammar.toString(); case MatrixProfile.immersionMode: diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index 6c3a87f00..207600497 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -61,6 +61,16 @@ class SettingsLearningView extends StatelessWidget { pStoreKey: setting.toString(), local: false, ), + PSettingsSwitchListTile.adaptive( + defaultValue: controller.pangeaController.pStoreService.read( + PLocalKey.itAutoPlay, + ) ?? + false, + title: L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader, + subtitle: L10n.of(context)!.interactiveTranslatorAutoPlayDesc, + pStoreKey: PLocalKey.itAutoPlay, + local: false, + ), PSettingsSwitchListTile.adaptive( defaultValue: controller.pangeaController.pStoreService.read( PLocalKey.autoPlayMessages, diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 75738a687..1f31ea07f 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -1,6 +1,7 @@ import 'dart:developer'; import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/enum/span_data_type.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; import 'package:fluffychat/pangea/utils/bot_style.dart'; @@ -15,7 +16,6 @@ import '../../../widgets/matrix.dart'; import '../../choreographer/widgets/choice_array.dart'; import '../../controllers/pangea_controller.dart'; import '../../enum/span_choice_type.dart'; -import '../../models/class_model.dart'; import '../../models/span_card_model.dart'; import '../common/bot_face_svg.dart'; import 'card_header.dart'; @@ -472,7 +472,7 @@ class DontShowSwitchListTileState extends State { value: switchValue, onChanged: (value) => { widget.controller.pStoreService.save( - ToolSetting.itAutoPlay.toString(), + PLocalKey.itAutoPlay.toString(), value, ), setState(() => switchValue = value), From bc2d4a38471536136f6f56b0351ad2180d9dfdd3 Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:21:57 -0400 Subject: [PATCH 12/12] itAutoPlay moved from ToolSettings to PLocalKey --- .../controllers/choreographer.dart | 8 +-- lib/pangea/constants/local.key.dart | 1 + lib/pangea/controllers/local_settings.dart | 3 +- lib/pangea/controllers/user_controller.dart | 18 +++---- lib/pangea/models/class_model.dart | 51 +++++++------------ lib/pangea/models/user_model.dart | 6 +-- .../settings_learning_view.dart | 10 ++++ lib/pangea/widgets/igc/span_card.dart | 4 +- 8 files changed, 48 insertions(+), 53 deletions(-) diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 529ba95b4..5921c6eb7 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -15,6 +15,7 @@ import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/it_step.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/overlay.dart'; @@ -513,10 +514,9 @@ class Choreographer { chatController.room, ); - bool get itAutoPlayEnabled => pangeaController.permissionsController.isToolEnabled( - ToolSetting.itAutoPlay, - chatController.room, - ); + bool get itAutoPlayEnabled => pangeaController.pStoreService.read( + MatrixProfile.itAutoPlay.title, + ) ?? false; bool get definitionsEnabled => pangeaController.permissionsController.isToolEnabled( diff --git a/lib/pangea/constants/local.key.dart b/lib/pangea/constants/local.key.dart index c0390c2ba..8dc496bf8 100644 --- a/lib/pangea/constants/local.key.dart +++ b/lib/pangea/constants/local.key.dart @@ -11,4 +11,5 @@ class PLocalKey { static const String dismissedPaywall = 'dismissedPaywall'; static const String paywallBackoff = 'paywallBackoff'; static const String autoPlayMessages = 'autoPlayMessages'; + static const String itAutoPlay = 'itAutoPlay'; } diff --git a/lib/pangea/controllers/local_settings.dart b/lib/pangea/controllers/local_settings.dart index d6ae119a5..5984a7bf5 100644 --- a/lib/pangea/controllers/local_settings.dart +++ b/lib/pangea/controllers/local_settings.dart @@ -9,8 +9,7 @@ class LocalSettings { } bool userLanguageToolSetting(ToolSetting setting) => - _pangeaController.pStoreService.read(setting.toString()) - ?? setting != ToolSetting.itAutoPlay; + _pangeaController.pStoreService.read(setting.toString()) ?? true; // bool get userEnableIT => // _pangeaController.pStoreService.read(ToolSetting.interactiveTranslator.toString()) ?? true; diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 0e336fdf6..31cde897f 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -123,10 +123,10 @@ class UserController extends BaseController { : null; final bool? autoPlay = migratedProfileInfo(MatrixProfile.autoPlayMessages); + final bool? itAutoPlay = migratedProfileInfo(MatrixProfile.itAutoPlay); final bool? trial = migratedProfileInfo(MatrixProfile.activatedFreeTrial); final bool? interactiveTranslator = migratedProfileInfo(MatrixProfile.interactiveTranslator); - final bool? itAutoPlay = migratedProfileInfo(MatrixProfile.itAutoPlay); final bool? interactiveGrammar = migratedProfileInfo(MatrixProfile.interactiveGrammar); final bool? immersionMode = @@ -143,9 +143,9 @@ class UserController extends BaseController { await updateMatrixProfile( dateOfBirth: dob, autoPlayMessages: autoPlay, + itAutoPlay: itAutoPlay, activatedFreeTrial: trial, interactiveTranslator: interactiveTranslator, - itAutoPlay: itAutoPlay, interactiveGrammar: interactiveGrammar, immersionMode: immersionMode, definitions: definitions, @@ -225,9 +225,9 @@ class UserController extends BaseController { Future updateMatrixProfile({ String? dateOfBirth, bool? autoPlayMessages, + bool? itAutoPlay, bool? activatedFreeTrial, bool? interactiveTranslator, - bool? itAutoPlay, bool? interactiveGrammar, bool? immersionMode, bool? definitions, @@ -253,6 +253,12 @@ class UserController extends BaseController { autoPlayMessages, ); } + if (itAutoPlay != null) { + await _pangeaController.pStoreService.save( + MatrixProfile.itAutoPlay.title, + itAutoPlay, + ); + } if (activatedFreeTrial != null) { await _pangeaController.pStoreService.save( MatrixProfile.activatedFreeTrial.title, @@ -265,12 +271,6 @@ class UserController extends BaseController { interactiveTranslator, ); } - if (itAutoPlay != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.itAutoPlay.title, - itAutoPlay, - ); - } if (interactiveGrammar != null) { await _pangeaController.pStoreService.save( MatrixProfile.interactiveGrammar.title, diff --git a/lib/pangea/models/class_model.dart b/lib/pangea/models/class_model.dart index f663af8ce..0bebdac2f 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/class_model.dart @@ -31,13 +31,13 @@ class ClassSettingsModel { }); static ClassSettingsModel get newClass => ClassSettingsModel( - city: null, - country: null, - dominantLanguage: ClassDefaultValues.defaultDominantLanguage, - languageLevel: null, - schoolName: null, - targetLanguage: ClassDefaultValues.defaultTargetLanguage, - ); + city: null, + country: null, + dominantLanguage: ClassDefaultValues.defaultDominantLanguage, + languageLevel: null, + schoolName: null, + targetLanguage: ClassDefaultValues.defaultTargetLanguage, + ); factory ClassSettingsModel.fromJson(Map json) { return ClassSettingsModel( @@ -100,9 +100,9 @@ class ClassSettingsModel { } StateEvent get toStateEvent => StateEvent( - content: toJson(), - type: PangeaEventTypes.classSettings, - ); + content: toJson(), + type: PangeaEventTypes.classSettings, + ); } class PangeaRoomRules { @@ -120,7 +120,6 @@ class PangeaRoomRules { bool isInviteOnlyStudents; // 0 = forbidden, 1 = allow individual to choose, 2 = require int interactiveTranslator; - int itAutoPlay; int interactiveGrammar; int immersionMode; int definitions; @@ -139,7 +138,6 @@ class PangeaRoomRules { this.isVoiceNotes = true, this.isInviteOnlyStudents = true, this.interactiveTranslator = ClassDefaultValues.languageToolPermissions, - this.itAutoPlay = ClassDefaultValues.languageToolPermissions, this.interactiveGrammar = ClassDefaultValues.languageToolPermissions, this.immersionMode = ClassDefaultValues.languageToolPermissions, this.definitions = ClassDefaultValues.languageToolPermissions, @@ -191,9 +189,6 @@ class PangeaRoomRules { case ToolSetting.interactiveTranslator: interactiveTranslator = value; break; - case ToolSetting.itAutoPlay: - itAutoPlay = value; - break; case ToolSetting.interactiveGrammar: interactiveGrammar = value; break; @@ -212,9 +207,9 @@ class PangeaRoomRules { } StateEvent get toStateEvent => StateEvent( - content: toJson(), - type: PangeaEventTypes.rules, - ); + content: toJson(), + type: PangeaEventTypes.rules, + ); factory PangeaRoomRules.fromJson(Map json) => PangeaRoomRules( @@ -232,16 +227,14 @@ class PangeaRoomRules { isInviteOnlyStudents: json['is_invite_only_students'] ?? true, interactiveTranslator: json['interactive_translator'] ?? ClassDefaultValues.languageToolPermissions, - itAutoPlay: json['it_auto_play'] ?? - ClassDefaultValues.languageToolPermissions, interactiveGrammar: json['interactive_grammar'] ?? ClassDefaultValues.languageToolPermissions, immersionMode: json['immersion_mode'] ?? ClassDefaultValues.languageToolPermissions, definitions: - json['definitions'] ?? ClassDefaultValues.languageToolPermissions, + json['definitions'] ?? ClassDefaultValues.languageToolPermissions, translations: - json['translations'] ?? ClassDefaultValues.languageToolPermissions, + json['translations'] ?? ClassDefaultValues.languageToolPermissions, ); Map toJson() { @@ -259,7 +252,6 @@ class PangeaRoomRules { data['is_voice_notes'] = isVoiceNotes; data['is_invite_only_students'] = isInviteOnlyStudents; data['interactive_translator'] = interactiveTranslator; - data['it_auto_play'] = itAutoPlay; data['interactive_grammar'] = interactiveGrammar; data['immersion_mode'] = immersionMode; data['definitions'] = definitions; @@ -271,8 +263,6 @@ class PangeaRoomRules { switch (setting) { case ToolSetting.interactiveTranslator: return interactiveTranslator; - case ToolSetting.itAutoPlay: - return itAutoPlay; case ToolSetting.interactiveGrammar: return interactiveGrammar; case ToolSetting.immersionMode: @@ -287,9 +277,9 @@ class PangeaRoomRules { } String languageToolPermissionsText( - BuildContext context, - ToolSetting setting, - ) { + BuildContext context, + ToolSetting setting, + ) { switch (getToolSettings(setting)) { case 0: return L10n.of(context)!.interactiveTranslatorNotAllowed; @@ -305,7 +295,6 @@ class PangeaRoomRules { enum ToolSetting { interactiveTranslator, - itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -317,8 +306,6 @@ extension SettingCopy on ToolSetting { switch (this) { case ToolSetting.interactiveTranslator: return L10n.of(context)!.interactiveTranslatorSliderHeader; - case ToolSetting.itAutoPlay: - return L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader; case ToolSetting.interactiveGrammar: return L10n.of(context)!.interactiveGrammarSliderHeader; case ToolSetting.immersionMode: @@ -337,8 +324,6 @@ extension SettingCopy on ToolSetting { return L10n.of(context)!.itToggleDescription; case ToolSetting.interactiveGrammar: return L10n.of(context)!.igcToggleDescription; - case ToolSetting.itAutoPlay: - return L10n.of(context)!.interactiveTranslatorAutoPlayDesc; case ToolSetting.immersionMode: return L10n.of(context)!.toggleImmersionModeDesc; case ToolSetting.definitions: diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 396bcaccb..3721da95c 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -54,9 +54,9 @@ class PUserModel { enum MatrixProfile { dateOfBirth, autoPlayMessages, + itAutoPlay, activatedFreeTrial, interactiveTranslator, - itAutoPlay, interactiveGrammar, immersionMode, definitions, @@ -78,12 +78,12 @@ extension MatrixProfileExtension on MatrixProfile { return ModelKey.userDateOfBirth; case MatrixProfile.autoPlayMessages: return PLocalKey.autoPlayMessages; + case MatrixProfile.itAutoPlay: + return PLocalKey.itAutoPlay; case MatrixProfile.activatedFreeTrial: return PLocalKey.activatedTrialKey; case MatrixProfile.interactiveTranslator: return ToolSetting.interactiveTranslator.toString(); - case MatrixProfile.itAutoPlay: - return ToolSetting.itAutoPlay.toString(); case MatrixProfile.interactiveGrammar: return ToolSetting.interactiveGrammar.toString(); case MatrixProfile.immersionMode: diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index 6c3a87f00..207600497 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -61,6 +61,16 @@ class SettingsLearningView extends StatelessWidget { pStoreKey: setting.toString(), local: false, ), + PSettingsSwitchListTile.adaptive( + defaultValue: controller.pangeaController.pStoreService.read( + PLocalKey.itAutoPlay, + ) ?? + false, + title: L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader, + subtitle: L10n.of(context)!.interactiveTranslatorAutoPlayDesc, + pStoreKey: PLocalKey.itAutoPlay, + local: false, + ), PSettingsSwitchListTile.adaptive( defaultValue: controller.pangeaController.pStoreService.read( PLocalKey.autoPlayMessages, diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 75738a687..1f31ea07f 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -1,6 +1,7 @@ import 'dart:developer'; import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/enum/span_data_type.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; import 'package:fluffychat/pangea/utils/bot_style.dart'; @@ -15,7 +16,6 @@ import '../../../widgets/matrix.dart'; import '../../choreographer/widgets/choice_array.dart'; import '../../controllers/pangea_controller.dart'; import '../../enum/span_choice_type.dart'; -import '../../models/class_model.dart'; import '../../models/span_card_model.dart'; import '../common/bot_face_svg.dart'; import 'card_header.dart'; @@ -472,7 +472,7 @@ class DontShowSwitchListTileState extends State { value: switchValue, onChanged: (value) => { widget.controller.pStoreService.save( - ToolSetting.itAutoPlay.toString(), + PLocalKey.itAutoPlay.toString(), value, ), setState(() => switchValue = value),