Merge branch 'develop' into feat/pinned

packages/stream_chat_flutter/lib/src/channel_list_view.dart

@@ -12,6 +12,9 @@ import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 /// Callback called when tapping on a channel
 typedef ChannelTapCallback = void Function(Channel, Widget?);
 
+/// Callback called when tapping on a channel
+typedef ChannelInfoCallback = void Function(Channel);
+
 /// Builder used to create a custom [ChannelPreview] from a [Channel]
 typedef ChannelPreviewBuilder = Widget Function(BuildContext, Channel);
 
@@ -78,6 +81,9 @@ class ChannelListView extends StatefulWidget {
     this.emptyBuilder,
     this.loadingBuilder,
     this.listBuilder,
+    this.onMoreDetailsPressed,
+    this.onDeletePressed,
+    this.swipeActions,
   }) : super(key: key);
 
   /// If true a default swipe to action behaviour will be added to this widget
@@ -158,6 +164,15 @@ class ChannelListView extends StatefulWidget {
   /// The builder used when the channel list is empty.
   final WidgetBuilder? emptyBuilder;
 
+  /// Callback used when the more details slidable option is pressed
+  final ChannelInfoCallback? onMoreDetailsPressed;
+
+  /// Callback used when the delete slidable option is pressed
+  final ChannelInfoCallback? onDeletePressed;
+
+  /// List of actions for slidable
+  final List<SwipeAction>? swipeActions;
+
   @override
   _ChannelListViewState createState() => _ChannelListViewState();
 }
@@ -465,61 +480,79 @@ class _ChannelListViewState extends State<ChannelListView> {
             enabled: widget.swipeToAction,
             actionPane: const SlidableBehindActionPane(),
             actionExtentRatio: 0.12,
-            secondaryActions: <Widget>[
-              IconSlideAction(
-                color: backgroundColor,
-                icon: Icons.more_horiz,
-                onTap: () {
-                  showModalBottomSheet(
-                    clipBehavior: Clip.hardEdge,
-                    shape: const RoundedRectangleBorder(
-                      borderRadius: BorderRadius.only(
-                        topLeft: Radius.circular(32),
-                        topRight: Radius.circular(32),
-                      ),
-                    ),
-                    context: context,
-                    builder: (context) => StreamChannel(
-                      channel: channel,
-                      child: ChannelBottomSheet(
-                        onViewInfoTap: () {
-                          widget.onViewInfoTap?.call(channel);
-                        },
-                      ),
-                    ),
-                  );
-                },
-              ),
-              if ([
-                'admin',
-                'owner',
-              ].contains(channel.state!.members
-                  .firstWhereOrNull(
-                      (m) => m.userId == channel.client.state.user?.id)
-                  ?.role))
-                IconSlideAction(
-                  color: backgroundColor,
-                  iconWidget: StreamSvgIcon.delete(
-                    color: chatThemeData.colorTheme.accentRed,
+            secondaryActions: widget.swipeActions
+                    ?.map((e) => IconSlideAction(
+                          color: e.color,
+                          iconWidget: e.iconWidget,
+                          onTap: () {
+                            e.onTap?.call(channel);
+                          },
+                        ))
+                    .toList() ??
+                <Widget>[
+                  IconSlideAction(
+                    color: backgroundColor,
+                    icon: Icons.more_horiz,
+                    onTap: widget.onMoreDetailsPressed != null
+                        ? () {
+                            widget.onMoreDetailsPressed!(channel);
+                          }
+                        : () {
+                            showModalBottomSheet(
+                              clipBehavior: Clip.hardEdge,
+                              shape: const RoundedRectangleBorder(
+                                borderRadius: BorderRadius.only(
+                                  topLeft: Radius.circular(32),
+                                  topRight: Radius.circular(32),
+                                ),
+                              ),
+                              context: context,
+                              builder: (context) => StreamChannel(
+                                channel: channel,
+                                child: ChannelBottomSheet(
+                                  onViewInfoTap: () {
+                                    widget.onViewInfoTap?.call(channel);
+                                  },
+                                ),
+                              ),
+                            );
+                          },
                   ),
-                  onTap: () async {
-                    final res = await showConfirmationDialog(
-                      context,
-                      title: 'Delete Conversation',
-                      okText: 'DELETE',
-                      question:
-                          'Are you sure you want to delete this conversation?',
-                      cancelText: 'CANCEL',
-                      icon: StreamSvgIcon.delete(
+                  if ([
+                    'admin',
+                    'owner',
+                  ].contains(channel.state!.members
+                      .firstWhereOrNull(
+                          (m) => m.userId == channel.client.state.user?.id)
+                      ?.role))
+                    IconSlideAction(
+                      color: backgroundColor,
+                      iconWidget: StreamSvgIcon.delete(
                         color: chatThemeData.colorTheme.accentRed,
                       ),
-                    );
-                    if (res == true) {
-                      await channel.delete();
-                    }
-                  },
-                ),
-            ],
+                      onTap: widget.onDeletePressed != null
+                          ? () {
+                              widget.onDeletePressed!(channel);
+                            }
+                          : () async {
+                              final res = await showConfirmationDialog(
+                                context,
+                                title: 'Delete Conversation',
+                                okText: 'DELETE',
+                                question:
+                                    // ignore: lines_longer_than_80_chars
+                                    'Are you sure you want to delete this conversation?',
+                                cancelText: 'CANCEL',
+                                icon: StreamSvgIcon.delete(
+                                  color: chatThemeData.colorTheme.accentRed,
+                                ),
+                              );
+                              if (res == true) {
+                                await channel.delete();
+                              }
+                            },
+                    ),
+                ],
             child: Container(
               color: chatThemeData.colorTheme.whiteSnow,
               child: widget.channelPreviewBuilder?.call(context, channel) ??
@@ -640,3 +673,22 @@ class _ChannelListViewState extends State<ChannelListView> {
     );
   }
 }
+
+/// Class for slidable action
+class SwipeAction {
+  /// Constructor for creating [SwipeAction]
+  SwipeAction({
+    this.color,
+    required this.iconWidget,
+    this.onTap,
+  });
+
+  /// Background color of action
+  Color? color;
+
+  /// Widget to display as icon
+  Widget iconWidget;
+
+  /// Callback when icon is tapped
+  ChannelInfoCallback? onTap;
+}

packages/stream_chat_flutter/lib/src/message_actions_modal.dart

@@ -37,6 +37,7 @@ class MessageActionsModal extends StatefulWidget {
     this.customActions = const [],
     this.attachmentBorderRadiusGeometry,
     this.onCopyTap,
+    this.textBuilder,
   }) : super(key: key);
 
   /// Builder for edit message
@@ -105,6 +106,9 @@ class MessageActionsModal extends StatefulWidget {
   /// List of custom actions
   final List<MessageAction> customActions;
 
+  /// Customize the MessageWidget textBuilder
+  final Widget Function(BuildContext context, Message message)? textBuilder;
+
   @override
   _MessageActionsModalState createState() => _MessageActionsModalState();
 }
@@ -231,6 +235,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
                               shape: widget.messageShape,
                               attachmentShape: widget.attachmentShape,
                               showPinHighlight: false,
+                              textBuilder: widget.textBuilder,
                             ),
                           ),
                           const SizedBox(height: 8),

packages/stream_chat_flutter/lib/src/message_list_view.dart

@@ -156,9 +156,10 @@ class MessageListView extends StatefulWidget {
     this.onMessageTap,
     this.onSystemMessageTap,
     this.onAttachmentTap,
-    this.textBuilder,
     this.onLinkTap,
     this.pinPermissions = const [],
+    this.textBuilder,
+    this.usernameBuilder,
   }) : super(key: key);
 
   /// Function used to build a custom message widget
@@ -260,7 +261,10 @@ class MessageListView extends StatefulWidget {
   final void Function(Message message, Attachment attachment)? onAttachmentTap;
 
   /// Customize the MessageWidget textBuilder
-  final void Function(BuildContext context, Message message)? textBuilder;
+  final Widget Function(BuildContext context, Message message)? textBuilder;
+
+  /// Customize the MessageWidget usernameBuilder
+  final Widget Function(BuildContext context, Message message)? usernameBuilder;
 
   /// Callback for when link is tapped
   final void Function(String link)? onLinkTap;
@@ -865,8 +869,8 @@ class _MessageListViewState extends State<MessageListView> {
         }
         FocusScope.of(context).unfocus();
       },
-      textBuilder:
-          widget.textBuilder as Widget Function(BuildContext, Message)?,
+      textBuilder: widget.textBuilder,
+      usernameBuilder: widget.usernameBuilder,
       onLinkTap: widget.onLinkTap,
       showPinButton: widget.pinPermissions.contains(currentUserMember.role),
     );
@@ -1070,8 +1074,8 @@ class _MessageListViewState extends State<MessageListView> {
         FocusScope.of(context).unfocus();
       },
       onAttachmentTap: widget.onAttachmentTap,
-      textBuilder:
-          widget.textBuilder as Widget Function(BuildContext, Message)?,
+      textBuilder: widget.textBuilder,
+      usernameBuilder: widget.usernameBuilder,
       onLinkTap: widget.onLinkTap,
       showPinButton: widget.pinPermissions.contains(currentUserMember.role),
     );

packages/stream_chat_flutter/lib/src/message_reactions_modal.dart

@@ -23,6 +23,7 @@ class MessageReactionsModal extends StatelessWidget {
     this.showUserAvatar = DisplayWidget.show,
     this.onUserAvatarTap,
     this.attachmentBorderRadiusGeometry,
+    this.textBuilder,
   }) : super(key: key);
 
   /// Message to display reactions of
@@ -52,6 +53,9 @@ class MessageReactionsModal extends StatelessWidget {
   /// [BorderRadius] to apply to attachments
   final BorderRadius? attachmentBorderRadiusGeometry;
 
+  /// Customize the MessageWidget textBuilder
+  final Widget Function(BuildContext context, Message message)? textBuilder;
+
   @override
   Widget build(BuildContext context) {
     final size = MediaQuery.of(context).size;
@@ -157,6 +161,7 @@ class MessageReactionsModal extends StatelessWidget {
                               ),
                               showReactionPickerIndicator: showReactions &&
                                   (message.status == MessageSendingStatus.sent),
+                              textBuilder: textBuilder,
                               showPinHighlight: false,
                             ),
                           ),

packages/stream_chat_flutter/lib/src/message_widget.dart

@@ -104,6 +104,7 @@ class MessageWidget extends StatefulWidget {
     this.onQuotedMessageTap,
     this.customActions = const [],
     this.onAttachmentTap,
+    this.usernameBuilder,
   })  : attachmentBuilders = {
           'image': (context, message, attachments) {
             final border = RoundedRectangleBorder(
@@ -267,6 +268,9 @@ class MessageWidget extends StatefulWidget {
   /// Widget builder for building text
   final Widget Function(BuildContext, Message)? textBuilder;
 
+  /// Widget builder for building username
+  final Widget Function(BuildContext, Message)? usernameBuilder;
+
   /// Function called on long press
   final void Function(BuildContext, Message)? onMessageActions;
 
@@ -751,14 +755,7 @@ class _MessageWidgetState extends State<MessageWidget>
           child: Text(msg, style: widget.messageTheme.replies),
         ),
       ],
-      if (showUsername)
-        Text(
-          widget.message.user!.name,
-          maxLines: 1,
-          key: usernameKey,
-          style: widget.messageTheme.messageAuthor,
-          overflow: TextOverflow.ellipsis,
-        ),
+      if (showUsername) _buildUsername(usernameKey),
       if (showTimeStamp)
         Text(
           Jiffy(widget.message.createdAt.toLocal()).jm,
@@ -821,6 +818,19 @@ class _MessageWidgetState extends State<MessageWidget>
     );
   }
 
+  Widget _buildUsername(Key usernameKey) {
+    if (widget.usernameBuilder != null) {
+      return widget.usernameBuilder!(context, widget.message);
+    }
+    return Text(
+      widget.message.user!.name,
+      maxLines: 1,
+      key: usernameKey,
+      style: widget.messageTheme.messageAuthor,
+      overflow: TextOverflow.ellipsis,
+    );
+  }
+
   Widget _buildUrlAttachment() {
     final urlAttachment = widget.message.attachments
         .firstWhere((element) => element.ogScrapeUrl != null);
@@ -912,6 +922,7 @@ class _MessageWidgetState extends State<MessageWidget>
         builder: (context) => StreamChannel(
               channel: channel,
               child: MessageActionsModal(
+                textBuilder: widget.textBuilder,
                 onCopyTap: (message) =>
                     Clipboard.setData(ClipboardData(text: message.text)),
                 attachmentBorderRadiusGeometry:
@@ -962,6 +973,7 @@ class _MessageWidgetState extends State<MessageWidget>
       builder: (context) => StreamChannel(
         channel: channel,
         child: MessageReactionsModal(
+          textBuilder: widget.textBuilder,
           attachmentBorderRadiusGeometry:
               widget.attachmentBorderRadiusGeometry as BorderRadius?,
           showUserAvatar: