got rid of practice activity for non target language

pull/1476/head
choreo development 1 year ago
parent db2ad031eb
commit cd50460939

@ -9,6 +9,7 @@ enum MessageMode {
definition, definition,
translation, translation,
speechToText, speechToText,
nullMode
} }
extension MessageModeExtension on MessageMode { extension MessageModeExtension on MessageMode {
@ -25,6 +26,7 @@ extension MessageModeExtension on MessageMode {
return Icons.book; return Icons.book;
case MessageMode.practiceActivity: case MessageMode.practiceActivity:
return Symbols.fitness_center; return Symbols.fitness_center;
case MessageMode.nullMode:
default: default:
return Icons.error; // Icon to indicate an error or unsupported mode return Icons.error; // Icon to indicate an error or unsupported mode
} }
@ -42,6 +44,7 @@ extension MessageModeExtension on MessageMode {
return L10n.of(context)!.definitions; return L10n.of(context)!.definitions;
case MessageMode.practiceActivity: case MessageMode.practiceActivity:
return L10n.of(context)!.practice; return L10n.of(context)!.practice;
case MessageMode.nullMode:
default: default:
return L10n.of(context)! return L10n.of(context)!
.oopsSomethingWentWrong; // Title to indicate an error or unsupported mode .oopsSomethingWentWrong; // Title to indicate an error or unsupported mode
@ -60,18 +63,23 @@ extension MessageModeExtension on MessageMode {
return L10n.of(context)!.define; return L10n.of(context)!.define;
case MessageMode.practiceActivity: case MessageMode.practiceActivity:
return L10n.of(context)!.practice; return L10n.of(context)!.practice;
case MessageMode.nullMode:
default: default:
return L10n.of(context)! return L10n.of(context)!
.oopsSomethingWentWrong; // Title to indicate an error or unsupported mode .oopsSomethingWentWrong; // Title to indicate an error or unsupported mode
} }
} }
bool isValidMode(Event event) { bool shouldShowAsToolbarButton(Event event) {
switch (this) { switch (this) {
case MessageMode.translation: case MessageMode.translation:
return event.messageType == MessageTypes.Text;
case MessageMode.textToSpeech: case MessageMode.textToSpeech:
return event.messageType == MessageTypes.Text;
case MessageMode.definition: case MessageMode.definition:
return event.messageType == MessageTypes.Text; return event.messageType == MessageTypes.Text;
case MessageMode.nullMode:
return false;
case MessageMode.speechToText: case MessageMode.speechToText:
return event.messageType == MessageTypes.Audio; return event.messageType == MessageTypes.Audio;
case MessageMode.practiceActivity: case MessageMode.practiceActivity:

@ -0,0 +1,47 @@
import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';
import 'package:fluffychat/pangea/utils/bot_style.dart';
import 'package:flutter/material.dart';
class MessageDisplayCard extends StatelessWidget {
final PangeaMessageEvent messageEvent;
final String? displayText;
const MessageDisplayCard({
super.key,
required this.messageEvent,
required this.displayText,
});
@override
Widget build(BuildContext context) {
// If no display text is provided, show a message indicating no content
if (displayText == null || displayText!.isEmpty) {
return const Center(
child: Text(
'No content available.',
style: TextStyle(color: Colors.black54, fontSize: 16),
),
);
}
return Padding(
padding: const EdgeInsets.all(8),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: Column(
children: [
// Display the provided text
Text(
displayText!,
style: BotStyle.text(context),
),
],
),
),
],
),
);
}
}

@ -63,6 +63,10 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
int activitiesLeftToComplete = neededActivities; int activitiesLeftToComplete = neededActivities;
bool get messageInUserL2 =>
pangeaMessageEvent.messageDisplayLangCode ==
MatrixState.pangeaController.languageController.userL2?.langCode;
PangeaMessageEvent get pangeaMessageEvent => widget._pangeaMessageEvent; PangeaMessageEvent get pangeaMessageEvent => widget._pangeaMessageEvent;
@override @override
@ -143,6 +147,11 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
toolbarMode = MessageMode.speechToText; toolbarMode = MessageMode.speechToText;
return; return;
} }
// if (!messageInUserL2) {
// activitiesLeftToComplete = 0;
// toolbarMode = MessageMode.nullMode;
// return;
// }
if (activitiesLeftToComplete > 0) { if (activitiesLeftToComplete > 0) {
toolbarMode = MessageMode.practiceActivity; toolbarMode = MessageMode.practiceActivity;

@ -6,6 +6,7 @@ import 'package:fluffychat/pangea/enum/message_mode_enum.dart';
import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';
import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart';
import 'package:fluffychat/pangea/widgets/chat/message_audio_card.dart'; import 'package:fluffychat/pangea/widgets/chat/message_audio_card.dart';
import 'package:fluffychat/pangea/widgets/chat/message_display_card.dart';
import 'package:fluffychat/pangea/widgets/chat/message_selection_overlay.dart'; import 'package:fluffychat/pangea/widgets/chat/message_selection_overlay.dart';
import 'package:fluffychat/pangea/widgets/chat/message_speech_to_text_card.dart'; import 'package:fluffychat/pangea/widgets/chat/message_speech_to_text_card.dart';
import 'package:fluffychat/pangea/widgets/chat/message_translation_card.dart'; import 'package:fluffychat/pangea/widgets/chat/message_translation_card.dart';
@ -39,7 +40,22 @@ class MessageToolbar extends StatelessWidget {
); );
} }
// Check if the message is in the user's second language
final bool messageInUserL2 = pangeaMessageEvent.messageDisplayLangCode ==
MatrixState.pangeaController.languageController.userL2?.langCode;
// If not in the target language, set to nullMode
if (!messageInUserL2) {
overLayController.toolbarMode = MessageMode.nullMode;
}
switch (overLayController.toolbarMode) { switch (overLayController.toolbarMode) {
case MessageMode.nullMode:
return MessageDisplayCard(
messageEvent: pangeaMessageEvent, // Pass the message event here
displayText:
"Message not in target language", // Pass the display text,
);
case MessageMode.translation: case MessageMode.translation:
return MessageTranslationCard( return MessageTranslationCard(
messageEvent: pangeaMessageEvent, messageEvent: pangeaMessageEvent,

@ -22,7 +22,7 @@ class ToolbarButtons extends StatelessWidget {
overlayController.pangeaMessageEvent; overlayController.pangeaMessageEvent;
List<MessageMode> get modes => MessageMode.values List<MessageMode> get modes => MessageMode.values
.where((mode) => mode.isValidMode(pangeaMessageEvent.event)) .where((mode) => mode.shouldShowAsToolbarButton(pangeaMessageEvent.event))
.toList(); .toList();
static const double iconWidth = 36.0; static const double iconWidth = 36.0;

Loading…
Cancel
Save