got rid of practice activity for non target language
This commit is contained in:
parent
db2ad031eb
commit
cd50460939
5 changed files with 82 additions and 2 deletions
|
|
@ -9,6 +9,7 @@ enum MessageMode {
|
|||
definition,
|
||||
translation,
|
||||
speechToText,
|
||||
nullMode
|
||||
}
|
||||
|
||||
extension MessageModeExtension on MessageMode {
|
||||
|
|
@ -25,6 +26,7 @@ extension MessageModeExtension on MessageMode {
|
|||
return Icons.book;
|
||||
case MessageMode.practiceActivity:
|
||||
return Symbols.fitness_center;
|
||||
case MessageMode.nullMode:
|
||||
default:
|
||||
return Icons.error; // Icon to indicate an error or unsupported mode
|
||||
}
|
||||
|
|
@ -42,6 +44,7 @@ extension MessageModeExtension on MessageMode {
|
|||
return L10n.of(context)!.definitions;
|
||||
case MessageMode.practiceActivity:
|
||||
return L10n.of(context)!.practice;
|
||||
case MessageMode.nullMode:
|
||||
default:
|
||||
return L10n.of(context)!
|
||||
.oopsSomethingWentWrong; // Title to indicate an error or unsupported mode
|
||||
|
|
@ -60,18 +63,23 @@ extension MessageModeExtension on MessageMode {
|
|||
return L10n.of(context)!.define;
|
||||
case MessageMode.practiceActivity:
|
||||
return L10n.of(context)!.practice;
|
||||
case MessageMode.nullMode:
|
||||
default:
|
||||
return L10n.of(context)!
|
||||
.oopsSomethingWentWrong; // Title to indicate an error or unsupported mode
|
||||
}
|
||||
}
|
||||
|
||||
bool isValidMode(Event event) {
|
||||
bool shouldShowAsToolbarButton(Event event) {
|
||||
switch (this) {
|
||||
case MessageMode.translation:
|
||||
return event.messageType == MessageTypes.Text;
|
||||
case MessageMode.textToSpeech:
|
||||
return event.messageType == MessageTypes.Text;
|
||||
case MessageMode.definition:
|
||||
return event.messageType == MessageTypes.Text;
|
||||
case MessageMode.nullMode:
|
||||
return false;
|
||||
case MessageMode.speechToText:
|
||||
return event.messageType == MessageTypes.Audio;
|
||||
case MessageMode.practiceActivity:
|
||||
|
|
|
|||
47
lib/pangea/widgets/chat/message_display_card.dart
Normal file
47
lib/pangea/widgets/chat/message_display_card.dart
Normal file
|
|
@ -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;
|
||||
|
||||
bool get messageInUserL2 =>
|
||||
pangeaMessageEvent.messageDisplayLangCode ==
|
||||
MatrixState.pangeaController.languageController.userL2?.langCode;
|
||||
|
||||
PangeaMessageEvent get pangeaMessageEvent => widget._pangeaMessageEvent;
|
||||
|
||||
@override
|
||||
|
|
@ -143,6 +147,11 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
|
|||
toolbarMode = MessageMode.speechToText;
|
||||
return;
|
||||
}
|
||||
// if (!messageInUserL2) {
|
||||
// activitiesLeftToComplete = 0;
|
||||
// toolbarMode = MessageMode.nullMode;
|
||||
// return;
|
||||
// }
|
||||
|
||||
if (activitiesLeftToComplete > 0) {
|
||||
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/utils/error_handler.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_speech_to_text_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) {
|
||||
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:
|
||||
return MessageTranslationCard(
|
||||
messageEvent: pangeaMessageEvent,
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ class ToolbarButtons extends StatelessWidget {
|
|||
overlayController.pangeaMessageEvent;
|
||||
|
||||
List<MessageMode> get modes => MessageMode.values
|
||||
.where((mode) => mode.isValidMode(pangeaMessageEvent.event))
|
||||
.where((mode) => mode.shouldShowAsToolbarButton(pangeaMessageEvent.event))
|
||||
.toList();
|
||||
|
||||
static const double iconWidth = 36.0;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue