Merge branch 'main' into prevent-empty-chats

lib/pages/chat/events/message_content.dart

@@ -38,6 +38,7 @@ class MessageContent extends StatelessWidget {
   //further down in the chain is also using pangeaController so its not constant
   final bool immersionMode;
   final ToolbarDisplayController? toolbarController;
+  final bool isOverlay;
   // Pangea#
 
   const MessageContent(
@@ -50,6 +51,7 @@ class MessageContent extends StatelessWidget {
     this.pangeaMessageEvent,
     required this.immersionMode,
     required this.toolbarController,
+    this.isOverlay = false,
     // Pangea#
     required this.borderRadius,
   });
@@ -203,7 +205,8 @@ class MessageContent extends StatelessWidget {
                     &&
                     !(pangeaMessageEvent?.showRichText(
                           selected,
-                          toolbarController?.highlighted ?? false,
+                          isOverlay: isOverlay,
+                          highlighted: toolbarController?.highlighted ?? false,
                         ) ??
                         false)
                 // Pangea#
@@ -305,7 +308,8 @@ class MessageContent extends StatelessWidget {
             );
             if (pangeaMessageEvent?.showRichText(
                   selected,
-                  toolbarController?.highlighted ?? false,
+                  isOverlay: isOverlay,
+                  highlighted: toolbarController?.highlighted ?? false,
                 ) ??
                 false) {
               return PangeaRichText(

lib/pangea/matrix_event_wrappers/pangea_message_event.dart

@@ -80,18 +80,26 @@ class PangeaMessageEvent {
     return _latestEdit;
   }
 
-  bool showRichText(bool selected, bool highlighted) {
+  bool showRichText(
+    bool selected, {
+    bool highlighted = false,
+    bool isOverlay = false,
+  }) {
     if (!_isValidPangeaMessageEvent) {
       return false;
     }
-    // if (URLFinder.getMatches(event.body).isNotEmpty) {
-    //   return false;
-    // }
+
     if ([EventStatus.error, EventStatus.sending].contains(_event.status)) {
       return false;
     }
-    if (ownMessage && !selected && !highlighted) return false;
 
+    if (isOverlay) return true;
+
+    // if ownMessage, don't show rich text if not selected or highlighted
+    // and don't show is the message is not an overlay
+    if (ownMessage && ((!selected && !highlighted) || !isOverlay)) {
+      return false;
+    }
     return true;
   }
 

lib/pangea/models/word_data_model.dart

@@ -1,9 +1,8 @@
 import 'dart:developer';
 
-import 'package:flutter/foundation.dart';
-
 import 'package:fluffychat/pangea/constants/model_keys.dart';
 import 'package:fluffychat/pangea/widgets/igc/word_data_card.dart';
+import 'package:flutter/foundation.dart';
 
 class WordData {
   final String word;
@@ -102,10 +101,11 @@ class WordData {
   }) =>
       word == w && userL1 == l1 && userL2 == l2 && fullText == f;
 
-  String formattedPartOfSpeech(LanguageType languageType) {
+  String? formattedPartOfSpeech(LanguageType languageType) {
     final String pos = languageType == LanguageType.base
         ? basePartOfSpeech
         : targetPartOfSpeech;
+    if (pos.isEmpty) return null;
     return pos[0].toUpperCase() + pos.substring(1);
   }
 

lib/pangea/widgets/chat/message_toolbar.dart

@@ -134,8 +134,11 @@ class ToolbarDisplayController {
     });
   }
 
-  bool get highlighted =>
-      MatrixState.pAnyState.overlay.hashCode.toString() == overlayId;
+  bool get highlighted {
+    if (overlayId == null) return false;
+    if (MatrixState.pAnyState.overlay == null) overlayId = null;
+    return MatrixState.pAnyState.overlay.hashCode.toString() == overlayId;
+  }
 }
 
 class MessageToolbar extends StatefulWidget {

lib/pangea/widgets/chat/overlay_message.dart

@@ -141,6 +141,7 @@ class OverlayMessage extends StatelessWidget {
               pangeaMessageEvent: pangeaMessageEvent,
               immersionMode: immersionMode,
               toolbarController: toolbarController,
+              isOverlay: true,
             ),
             if (event.hasAggregatedEvents(
                       timeline,

lib/pangea/widgets/igc/pangea_rich_text.dart

@@ -48,28 +48,33 @@ class PangeaRichTextState extends State<PangeaRichText> {
   @override
   void initState() {
     super.initState();
-    updateTextSpan();
-  }
-
-  void updateTextSpan() {
-    setState(() {
-      textSpan = getTextSpan();
-    });
+    setTextSpan();
   }
 
   @override
   void didUpdateWidget(PangeaRichText oldWidget) {
     super.didUpdateWidget(oldWidget);
-    updateTextSpan();
+    setTextSpan();
+  }
+
+  void _setTextSpan(String newTextSpan) {
+    widget.toolbarController?.toolbar?.textSelection.setMessageText(
+      newTextSpan,
+    );
+    setState(() {
+      textSpan = newTextSpan;
+    });
   }
 
-  String getTextSpan() {
+  void setTextSpan() {
     if (_fetchingRepresentation == true) {
-      return widget.pangeaMessageEvent.body;
+      _setTextSpan(textSpan = widget.pangeaMessageEvent.body);
+      return;
     }
 
     if (repEvent != null) {
-      return repEvent!.text;
+      _setTextSpan(repEvent!.text);
+      return;
     }
 
     if (widget.pangeaMessageEvent.eventId.contains("webdebug")) {
@@ -84,7 +89,6 @@ class PangeaRichTextState extends State<PangeaRichText> {
 
     if (repEvent == null) {
       setState(() => _fetchingRepresentation = true);
-
       widget.pangeaMessageEvent
           .representationByLanguageGlobal(
             langCode: widget.pangeaMessageEvent.messageDisplayLangCode,
@@ -95,23 +99,17 @@ class PangeaRichTextState extends State<PangeaRichText> {
           )
           .then((event) {
         repEvent = event;
-        widget.toolbarController?.toolbar?.textSelection.setMessageText(
-          repEvent?.text ?? widget.pangeaMessageEvent.body,
-        );
+        _setTextSpan(repEvent?.text ?? widget.pangeaMessageEvent.body);
       }).whenComplete(() {
         if (mounted) {
           setState(() => _fetchingRepresentation = false);
         }
       });
-      return widget.pangeaMessageEvent.body;
+
+      _setTextSpan(widget.pangeaMessageEvent.body);
     } else {
-      widget.toolbarController?.toolbar?.textSelection.setMessageText(
-        repEvent!.text,
-      );
-      setState(() {});
+      _setTextSpan(repEvent!.text);
     }
-
-    return repEvent!.text;
   }
 
   @override
@@ -190,7 +188,10 @@ class PangeaRichTextState extends State<PangeaRichText> {
 
     return blur > 0
         ? ImageFiltered(
-            imageFilter: ImageFilter.blur(sigmaX: blur, sigmaY: blur),
+            imageFilter: ImageFilter.blur(
+              sigmaX: blur,
+              sigmaY: blur,
+            ),
             child: richText,
           )
         : richText;

lib/pangea/widgets/igc/word_data_card.dart

@@ -314,6 +314,23 @@ class PartOfSpeechBlock extends StatelessWidget {
     required this.languageType,
   });
 
+  String get exampleSentence => languageType == LanguageType.target
+      ? wordData.targetExampleSentence
+      : wordData.baseExampleSentence;
+
+  String get definition => languageType == LanguageType.target
+      ? wordData.targetDefinition
+      : wordData.baseDefinition;
+
+  String formattedTitle(BuildContext context) {
+    final String word = languageType == LanguageType.target
+        ? wordData.targetWord
+        : wordData.baseWord;
+    String? pos = wordData.formattedPartOfSpeech(languageType);
+    if (pos == null || pos.isEmpty) pos = L10n.of(context)!.unkDisplayName;
+    return "$word (${wordData.formattedPartOfSpeech(languageType)})";
+  }
+
   @override
   Widget build(BuildContext context) {
     return Padding(
@@ -324,9 +341,7 @@ class PartOfSpeechBlock extends StatelessWidget {
           Align(
             alignment: Alignment.centerLeft,
             child: Text(
-              languageType == LanguageType.target
-                  ? "${wordData.targetWord} (${wordData.formattedPartOfSpeech(languageType)})"
-                  : "${wordData.baseWord} (${wordData.formattedPartOfSpeech(languageType)})",
+              formattedTitle(context),
               style: BotStyle.text(context, italics: true, bold: false),
             ),
           ),
@@ -337,47 +352,43 @@ class PartOfSpeechBlock extends StatelessWidget {
               alignment: Alignment.centerLeft,
               child: Column(
                 children: [
-                  RichText(
-                    text: TextSpan(
-                      style: BotStyle.text(
-                        context,
-                        italics: false,
-                        bold: false,
-                      ),
-                      children: <TextSpan>[
-                        TextSpan(
-                          text: "${L10n.of(context)!.definition}: ",
-                          style: const TextStyle(fontWeight: FontWeight.bold),
-                        ),
-                        TextSpan(
-                          text: languageType == LanguageType.target
-                              ? wordData.targetDefinition
-                              : wordData.baseDefinition,
+                  if (definition.isNotEmpty)
+                    RichText(
+                      text: TextSpan(
+                        style: BotStyle.text(
+                          context,
+                          italics: false,
+                          bold: false,
                         ),
-                      ],
+                        children: <TextSpan>[
+                          TextSpan(
+                            text: "${L10n.of(context)!.definition}: ",
+                            style: const TextStyle(fontWeight: FontWeight.bold),
+                          ),
+                          TextSpan(text: definition),
+                        ],
+                      ),
                     ),
-                  ),
                   const SizedBox(height: 10),
-                  RichText(
-                    text: TextSpan(
-                      style: BotStyle.text(
-                        context,
-                        italics: false,
-                        bold: false,
-                      ),
-                      children: <TextSpan>[
-                        TextSpan(
-                          text: "${L10n.of(context)!.exampleSentence}: ",
-                          style: const TextStyle(fontWeight: FontWeight.bold),
+                  if (exampleSentence.isNotEmpty)
+                    RichText(
+                      text: TextSpan(
+                        style: BotStyle.text(
+                          context,
+                          italics: false,
+                          bold: false,
                         ),
-                        TextSpan(
-                          text: languageType == LanguageType.target
-                              ? wordData.targetExampleSentence
-                              : wordData.baseExampleSentence,
-                        ),
-                      ],
+                        children: <TextSpan>[
+                          TextSpan(
+                            text: "${L10n.of(context)!.exampleSentence}: ",
+                            style: const TextStyle(
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          TextSpan(text: exampleSentence),
+                        ],
+                      ),
                     ),
-                  ),
                 ],
               ),
             ),