TW-1196: Update display pill with display name

linagora · Feb 15, 2024 · cd49f8c · cd49f8c
1 parent 4cd6c2d
commit cd49f8c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/lib/domain/model/extensions/string_extension.dart b/lib/domain/model/extensions/string_extension.dart
@@ -4,4 +4,8 @@ extension StringExtension on String {
         ? '${substring(0, 15)}...${substring(length - 15)}'
         : this;
   }
+
+  String get displayMentioned {
+    return '@[$this]';
+  }
 }
diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
@@ -1,9 +1,10 @@
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
+import 'package:fluffychat/domain/model/extensions/string_extension.dart';
 import 'package:fluffychat/pages/image_viewer/image_viewer.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/utils/url_launcher.dart';
-import 'package:fluffychat/widgets/mentionned_user.dart';
+import 'package:fluffychat/widgets/mentioned_user.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
@@ -178,8 +179,8 @@ class HtmlMessage extends StatelessWidget {
       pillBuilder: (identifier, url, onTap, getMxcUrl) {
         final user = room.getUser(identifier);
         final displayName = user?.displayName ?? identifier;
-        return MentionnedUser(
-          displayName: displayName,
+        return MentionedUser(
+          displayName: displayName.displayMentioned,
           url: url,
           onTap: !room.isDirectChat ? onTap : null,
           textStyle: !room.isDirectChat

diff --git a/lib/pages/chat/input_bar/input_bar.dart b/lib/pages/chat/input_bar/input_bar.dart
@@ -418,6 +418,7 @@ class InputBar extends StatelessWidget with PasteImageMixin {
             textCapitalization: TextCapitalization.sentences,
           ),
           suggestionsCallback: (text) {
+            if (room!.isDirectChat) return [];
             final suggestions = getSuggestions(text);
             if (suggestions.isNotEmpty) {
               suggestionsController?.open();

diff --git a/lib/widgets/mentionned_user.dart → lib/widgets/mentioned_user.dart b/lib/widgets/mentionned_user.dart → lib/widgets/mentioned_user.dart
@@ -1,18 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_matrix_html/text_parser.dart';
 
-class MentionnedUser extends StatelessWidget {
+class MentionedUser extends StatelessWidget {
   final String displayName;
   final String url;
   final OnPillTap? onTap;
   final TextStyle? textStyle;
+  final int? maxLines;
 
-  const MentionnedUser({
+  const MentionedUser({
     Key? key,
     required this.displayName,
     required this.url,
     this.textStyle,
     this.onTap,
+    this.maxLines,
   }) : super(key: key);
 
   @override
@@ -25,7 +27,7 @@ class MentionnedUser extends StatelessWidget {
       child: Text(
         displayName,
         style: textStyle,
-        maxLines: 1,
+        maxLines: maxLines,
         overflow: TextOverflow.clip,
       ),
     );