Merge branch 'master' into feat/mark-message-delivered

Author: xsahil03x

CONTRIBUTING.md

@@ -160,6 +160,10 @@ PR titles should follow the format below:
 4. *types* other than `fix:` and `feat:` are allowed, for example **[@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional)** (based on the **[the Angular convention](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#-commit-message-guidelines)**) recommends `build:`, `chore:`, `ci:`, `docs:`, `style:`, `refactor:`, `perf:`, `test:`, and others.
 5. *footers* other than `BREAKING CHANGE: <description>` may be provided and follow a convention similar to **[git trailer format](https://git-scm.com/docs/git-interpret-trailers)**.
 
+### CHANGELOG.md Updates 📝
+
+After making changes, please ensure you update the `CHANGELOG.md` file located in the root of each package you modified.
+
 ### Testing
 
 At Stream, we value testing. Every PR should include passing tests for existing and new features. To run our test suite locally, you can use the following *Melos* command:
@@ -169,12 +173,6 @@ At Stream, we value testing. Every PR should include passing tests for existing
 > melos run test:flutter
 ```
 
-### Our Process
-
-By default, our development branch is `develop`. Contributors should create new PRs based on `develop` when working on new features. 
-
-Develop is merged into master after the team performs various automated and QA tests on the branch. Master can be considered our stable branch, it represents the latest published release on pub.dev. 
-
 ---
 
 # Versioning Policy

packages/stream_chat_flutter/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 - Added delivered status to `SendingIndicator` (double grey check for delivered, double accentPrimary check for read).
 - Added `isMessageDelivered` parameter to `SendingIndicator` widget.
+- Added `MessagePreviewFormatter` interface and `StreamMessagePreviewFormatter` implementation for
+  customizing message preview text formatting in channel lists and draft messages.
+- Added `messagePreviewFormatter` property to `StreamChatConfigurationData` for global customization
+  of message preview formatting.
+- Added formatter properties to theme data classes for customizing date/timestamp
+  formatting. [[#2312]](https://github.com/GetStream/stream-chat-flutter/issues/2312) [[#2406]](https://github.com/GetStream/stream-chat-flutter/issues/2406)
+
+🐞 Fixed
+
+- Fixed mistakenly passing the hyperlink text to the `onLinkTap` callback instead of the actual `href`.
 
 ## 9.19.0
 

packages/stream_chat_flutter/lib/src/channel/stream_draft_message_preview_text.dart

@@ -18,18 +18,13 @@ class StreamDraftMessagePreviewText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final theme = StreamChatTheme.of(context);
-    final colorTheme = theme.colorTheme;
+    final config = StreamChatConfiguration.of(context);
+    final formatter = config.messagePreviewFormatter;
 
-    final previewTextSpan = TextSpan(
-      text: '${context.translations.draftLabel}: ',
-      style: textStyle?.copyWith(
-        fontWeight: FontWeight.bold,
-        color: colorTheme.accentPrimary,
-      ),
-      children: [
-        TextSpan(text: draftMessage.text, style: textStyle),
-      ],
+    final previewTextSpan = formatter.formatDraftMessage(
+      context,
+      draftMessage,
+      textStyle: textStyle,
     );
 
     return Text.rich(

packages/stream_chat_flutter/lib/src/channel/stream_message_preview_text.dart

@@ -31,32 +31,15 @@ class StreamMessagePreviewText extends StatelessWidget {
     final translatedMessage = message.translate(translationLanguage);
     final previewMessage = translatedMessage.replaceMentions(linkify: false);
 
-    final previewText = _getPreviewText(context, previewMessage, currentUser);
-
-    final mentionedUsers = message.mentionedUsers;
-    final mentionedUsersRegex = RegExp(
-      mentionedUsers.map((it) => '@${it.name}').join('|'),
-    );
-
-    final previewTextSpan = TextSpan(
-      children: [
-        ...previewText.splitByRegExp(mentionedUsersRegex).map(
-          (text) {
-            // Bold the text if it is a mention user.
-            if (mentionedUsers.any((it) => '@${it.name}' == text)) {
-              return TextSpan(
-                text: text,
-                style: textStyle?.copyWith(fontWeight: FontWeight.bold),
-              );
-            }
-
-            return TextSpan(
-              text: text,
-              style: textStyle,
-            );
-          },
-        )
-      ],
+    final config = StreamChatConfiguration.of(context);
+    final formatter = config.messagePreviewFormatter;
+
+    final previewTextSpan = formatter.formatMessage(
+      context,
+      previewMessage,
+      channel: channel,
+      currentUser: currentUser,
+      textStyle: textStyle,
     );
 
     return Text.rich(
@@ -66,144 +49,4 @@ class StreamMessagePreviewText extends StatelessWidget {
       textAlign: TextAlign.start,
     );
   }
-
-  String _getPreviewText(
-    BuildContext context,
-    Message message,
-    User currentUser,
-  ) {
-    final translations = context.translations;
-
-    if (message.isDeleted) {
-      return translations.messageDeletedLabel;
-    }
-
-    if (message.isSystem) {
-      return message.text ?? translations.systemMessageLabel;
-    }
-
-    if (message.poll case final poll?) {
-      return _pollPreviewText(context, poll, currentUser);
-    }
-
-    final previewText = _previewMessageContextText(context, message);
-    if (previewText == null) return translations.emptyMessagePreviewText;
-
-    if (channel case final channel?) {
-      if (message.user?.id == currentUser.id) {
-        return '${translations.youText}: $previewText';
-      }
-
-      if (channel.memberCount > 2) {
-        return '${message.user?.name}: $previewText';
-      }
-    }
-
-    return previewText;
-  }
-
-  String _pollPreviewText(
-    BuildContext context,
-    Poll poll,
-    User currentUser,
-  ) {
-    final translations = context.translations;
-
-    // If the poll already contains some votes, we will preview the latest voter
-    // and the poll name
-    if (poll.latestVotes.firstOrNull?.user case final latestVoter?) {
-      if (latestVoter.id == currentUser.id) {
-        final youVoted = translations.pollYouVotedText;
-        return '📊 $youVoted: "${poll.name}"';
-      }
-
-      final someoneVoted = translations.pollSomeoneVotedText(latestVoter.name);
-      return '📊 $someoneVoted: "${poll.name}"';
-    }
-
-    // Otherwise, we will show the creator of the poll and the poll name
-    if (poll.createdBy case final creator?) {
-      if (creator.id == currentUser.id) {
-        final youCreated = translations.pollYouCreatedText;
-        return '📊 $youCreated: "${poll.name}"';
-      }
-
-      final someoneCreated = translations.pollSomeoneCreatedText(creator.name);
-      return '📊 $someoneCreated: "${poll.name}"';
-    }
-
-    // Otherwise, we will show the poll name if it exists.
-    if (poll.name.trim() case final pollName when pollName.isNotEmpty) {
-      return '📊 $pollName';
-    }
-
-    // If nothing else, we will show the default poll emoji.
-    return '📊';
-  }
-
-  String? _previewMessageContextText(
-    BuildContext context,
-    Message message,
-  ) {
-    final translations = context.translations;
-
-    final messageText = switch (message.text) {
-      final messageText? when messageText.isNotEmpty => messageText,
-      _ => null,
-    };
-
-    // If the message contains some attachments, we will show the first one
-    // and the text if it exists.
-    if (message.attachments.firstOrNull case final attachment?) {
-      final attachmentIcon = switch (attachment.type) {
-        AttachmentType.audio => '🎧',
-        AttachmentType.file => '📄',
-        AttachmentType.image => '📷',
-        AttachmentType.video => '📹',
-        AttachmentType.giphy => '/giphy',
-        AttachmentType.voiceRecording => '🎤',
-        _ => null,
-      };
-
-      final attachmentTitle = switch (attachment.type) {
-        AttachmentType.audio => messageText ?? translations.audioAttachmentText,
-        AttachmentType.file => attachment.title ?? messageText,
-        AttachmentType.image => messageText ?? translations.imageAttachmentText,
-        AttachmentType.video => messageText ?? translations.videoAttachmentText,
-        AttachmentType.giphy => messageText,
-        AttachmentType.voiceRecording => translations.voiceRecordingText,
-        _ => null,
-      };
-
-      if (attachmentIcon != null || attachmentTitle != null) {
-        return [attachmentIcon, attachmentTitle].nonNulls.join(' ');
-      }
-    }
-
-    return messageText;
-  }
-}
-
-extension on String {
-  List<String> splitByRegExp(RegExp regex) {
-    // If the pattern is empty, return the whole string
-    if (regex.pattern.isEmpty) return [this];
-
-    final result = <String>[];
-    var start = 0;
-
-    for (final match in regex.allMatches(this)) {
-      if (match.start > start) {
-        result.add(substring(start, match.start));
-      }
-      result.add(match.group(0)!);
-      start = match.end;
-    }
-
-    if (start < length) {
-      result.add(substring(start));
-    }
-
-    return result;
-  }
 }

packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart

@@ -215,7 +215,13 @@ class BottomRow extends StatelessWidget {
         StreamTimestamp(
           date: message.createdAt.toLocal(),
           style: messageTheme.createdAtStyle,
-          formatter: (_, date) => Jiffy.parseFromDateTime(date).jm,
+          formatter: (context, date) {
+            if (messageTheme.createdAtFormatter case final formatter?) {
+              return formatter.call(context, date);
+            }
+
+            return Jiffy.parseFromDateTime(date).jm;
+          },
         ),
     ];
 

packages/stream_chat_flutter/lib/src/message_widget/message_text.dart

@@ -47,23 +47,23 @@ class StreamMessageText extends StatelessWidget {
           messageTheme: messageTheme,
           selectable: isDesktopDeviceOrWeb,
           onTapLink: (
-            String link,
+            String text,
             String? href,
             String title,
           ) {
-            if (link.startsWith('@')) {
+            if (text.startsWith('@')) {
               final mentionedUser = message.mentionedUsers.firstWhereOrNull(
-                (u) => '@${u.name}' == link,
+                (u) => '@${u.name}' == text,
               );
 
               if (mentionedUser == null) return;
 
               onMentionTap?.call(mentionedUser);
-            } else {
+            } else if (href != null) {
               if (onLinkTap != null) {
-                onLinkTap!(link);
+                onLinkTap!(href);
               } else {
-                launchURL(context, link);
+                launchURL(context, href);
               }
             }
           },

packages/stream_chat_flutter/lib/src/misc/date_divider.dart

@@ -12,6 +12,7 @@ class StreamDateDivider extends StatelessWidget {
     super.key,
     required this.dateTime,
     this.uppercase = false,
+    this.formatter,
   });
 
   /// [DateTime] to display
@@ -20,6 +21,9 @@ class StreamDateDivider extends StatelessWidget {
   /// If text is uppercase
   final bool uppercase;
 
+  /// Custom formatter for the date
+  final DateFormatter? formatter;
+
   @override
   Widget build(BuildContext context) {
     final chatThemeData = StreamChatTheme.of(context);
@@ -36,6 +40,12 @@ class StreamDateDivider extends StatelessWidget {
             color: chatThemeData.colorTheme.barsBg,
           ),
           formatter: (context, date) {
+            if (formatter case final formatter?) {
+              final timestamp = formatter.call(context, date);
+              if (uppercase) return timestamp.toUpperCase();
+              return timestamp;
+            }
+
             final timestamp = switch (date) {
               _ when date.isToday => context.translations.todayLabel,
               _ when date.isYesterday => context.translations.yesterdayLabel,

packages/stream_chat_flutter/lib/src/misc/timestamp.dart

@@ -12,11 +12,11 @@ class StreamTimestamp extends StatelessWidget {
   const StreamTimestamp({
     super.key,
     required this.date,
-    this.formatter = formatDate,
+    DateFormatter? formatter,
     this.style,
     this.textAlign,
     this.textDirection,
-  });
+  }) : formatter = formatter ?? formatDate;
 
   /// The date to show in the timestamp.
   final DateTime date;