Merge branch 'feature/new-ui' of https://github.com/GetStream/stream-chat-flutter into feature/error-tile

 Conflicts:

	lib/src/message_list_view.dart

example/lib/group_info_screen.dart

@@ -137,6 +137,7 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
               ),
               centerTitle: true,
               actions: [
+                if (!channel.channel.isDistinct)
                   StreamNeumorphicButton(
                     child: InkWell(
                       onTap: () {

example/lib/main.dart

@@ -623,8 +623,8 @@ class _ChannelPageState extends State<ChannelPage> {
 
   @override
   void initState() {
-    super.initState();
     _focusNode = FocusNode();
+    super.initState();
   }
 
   @override
@@ -635,7 +635,9 @@ class _ChannelPageState extends State<ChannelPage> {
 
   void _reply(Message message) {
     setState(() => _quotedMessage = message);
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       _focusNode.requestFocus();
+    });
   }
 
   @override
@@ -752,6 +754,7 @@ class _ChannelPageState extends State<ChannelPage> {
             quotedMessage: _quotedMessage,
             onQuotedMessageCleared: () {
               setState(() => _quotedMessage = null);
+              _focusNode.unfocus();
             },
           ),
         ],

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: example
 description: A new Flutter project.
-version: 1.1.0+1
+version: 1.1.1+1
 
 environment:
   sdk: ">=2.2.2 <3.0.0"

lib/src/channel_preview.dart

@@ -96,12 +96,16 @@ class ChannelPreview extends StatelessWidget {
                   Flexible(child: _buildSubtitle(context)),
                   Builder(
                     builder: (context) {
-                      if (channel.state.lastMessage?.user?.id ==
+                      final lastMessage = channel.state.messages.lastWhere(
+                        (m) => !m.isDeleted && m.shadowed != true,
+                        orElse: () => null,
+                      );
+                      if (lastMessage?.user?.id ==
                           StreamChat.of(context).user.id) {
                         return Padding(
                           padding: const EdgeInsets.only(right: 4.0),
                           child: SendingIndicator(
-                            message: channel.state.lastMessage,
+                            message: lastMessage,
                             size: StreamChatTheme.of(context)
                                 .channelPreviewTheme
                                 .indicatorIconSize,
@@ -110,8 +114,7 @@ class ChannelPreview extends StatelessWidget {
                                         element.user.id !=
                                         channel.client.state.user.id)
                                     ?.where((element) => element.lastRead
-                                        .isAfter(channel
+                                        .isAfter(lastMessage.createdAt))
-                                            .state.lastMessage.createdAt))
                                     ?.isNotEmpty ==
                                 true,
                           ),
@@ -201,16 +204,15 @@ class ChannelPreview extends StatelessWidget {
       stream: channel.state.messagesStream,
       initialData: channel.state.messages,
       builder: (context, snapshot) {
-        final lastMessage = snapshot.data
+        final lastMessage = snapshot.data?.lastWhere(
-            ?.lastWhere((m) => m.shadowed != true, orElse: () => null);
+            (m) => m.shadowed != true && !m.isDeleted,
+            orElse: () => null);
         if (lastMessage == null) {
           return SizedBox();
         }
 
         var text = lastMessage.text;
-        if (lastMessage.isDeleted) {
+        if (lastMessage.attachments != null) {
-          text = 'This message was deleted.';
-        } else if (lastMessage.attachments != null) {
           final parts = <String>[
             ...lastMessage.attachments.map((e) {
               if (e.type == 'image') {

lib/src/extension.dart

@@ -1,7 +1,28 @@
+import 'package:emojis/emoji.dart';
+import 'package:characters/characters.dart';
+
+final _emojis = Emoji.all();
+
 extension StringExtension on String {
   String capitalize() {
     return "${this[0].toUpperCase()}${this.substring(1)}";
   }
+
+  //  Emojis guidelines
+  //  1 to 3 emojis: big size with no text bubble.
+  //  4+ emojis or emojis+text: standard size with text bubble.
+  bool get isOnlyEmoji {
+    final characters = this.trim().characters;
+    if (characters.isEmpty) return false;
+    if (characters.length > 3) return false;
+    return characters.every((c) {
+      return _emojis.firstWhere(
+            (Emoji emoji) => emoji.char.contains(c),
+            orElse: () => null,
+          ) !=
+          null;
+    });
+  }
 }
 
 /// List extension

lib/src/message_actions_modal.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
@@ -7,13 +8,14 @@ import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_flutter/src/reaction_picker.dart';
 import 'package:stream_chat_flutter/src/stream_channel.dart';
 import 'package:stream_chat_flutter/src/stream_svg_icon.dart';
+import 'package:stream_chat_flutter/src/utils.dart';
 
 import 'message_input.dart';
 import 'message_widget.dart';
 import 'stream_chat.dart';
 import 'stream_chat_theme.dart';
 
-class MessageActionsModal extends StatelessWidget {
+class MessageActionsModal extends StatefulWidget {
   final Widget Function(BuildContext, Message) editMessageInputBuilder;
   final void Function(Message) onThreadReplyTap;
   final void Function(Message) onReplyTap;
@@ -26,6 +28,7 @@ class MessageActionsModal extends StatelessWidget {
   final bool showResendMessage;
   final bool showReplyMessage;
   final bool showThreadReplyMessage;
+  final bool showFlagButton;
   final bool reverse;
   final ShapeBorder messageShape;
   final DisplayWidget showUserAvatar;
@@ -43,22 +46,32 @@ class MessageActionsModal extends StatelessWidget {
     this.showReplyMessage = true,
     this.showResendMessage = true,
     this.showThreadReplyMessage = true,
+    this.showFlagButton = true,
     this.showUserAvatar = DisplayWidget.show,
     this.editMessageInputBuilder,
     this.messageShape,
     this.reverse = false,
   }) : super(key: key);
 
+  @override
+  _MessageActionsModalState createState() => _MessageActionsModalState();
+}
+
+class _MessageActionsModalState extends State<MessageActionsModal> {
   @override
   Widget build(BuildContext context) {
+    return _showMessageOptionsModal();
+  }
+
+  Widget _showMessageOptionsModal() {
     final size = MediaQuery.of(context).size;
     final user = StreamChat.of(context).user;
 
     final roughMaxSize = 2 * size.width / 3;
-    var messageTextLength = message.text.length;
+    var messageTextLength = widget.message.text.length;
-    if (message.quotedMessage != null) {
+    if (widget.message.quotedMessage != null) {
-      var quotedMessageLength = message.quotedMessage.text.length + 40;
+      var quotedMessageLength = widget.message.quotedMessage.text.length + 40;
-      if (message.quotedMessage.attachments?.isNotEmpty == true) {
+      if (widget.message.quotedMessage.attachments?.isNotEmpty == true) {
         quotedMessageLength += 40;
       }
       if (quotedMessageLength > messageTextLength) {
@@ -66,11 +79,16 @@ class MessageActionsModal extends StatelessWidget {
       }
     }
     final roughSentenceSize =
-        messageTextLength * messageTheme.messageText.fontSize * 1.2;
+        messageTextLength * widget.messageTheme.messageText.fontSize * 1.2;
-    final divFactor = message.attachments?.isNotEmpty == true
+    final divFactor = widget.message.attachments?.isNotEmpty == true
         ? 1
         : (roughSentenceSize == 0 ? 1 : (roughSentenceSize / roughMaxSize));
 
+    return TweenAnimationBuilder<double>(
+      tween: Tween(begin: 0.0, end: 1.0),
+      duration: Duration(milliseconds: 300),
+      curve: Curves.easeInOutBack,
+      builder: (context, val, snapshot) {
         return GestureDetector(
           behavior: HitTestBehavior.translucent,
           onTap: () => Navigator.maybePop(context),
@@ -87,79 +105,67 @@ class MessageActionsModal extends StatelessWidget {
                   ),
                 ),
               ),
-          Center(
+              Transform.scale(
+                scale: val,
+                child: Center(
                   child: SingleChildScrollView(
                     child: Padding(
                       padding: const EdgeInsets.symmetric(vertical: 8.0),
                       child: Column(
-                  crossAxisAlignment: reverse
+                        crossAxisAlignment: widget.reverse
                             ? CrossAxisAlignment.end
                             : CrossAxisAlignment.start,
                         children: <Widget>[
-                    if (showReactions &&
+                          if (widget.showReactions &&
-                        (message.status == MessageSendingStatus.SENT ||
+                              (widget.message.status ==
-                            message.status == null))
+                                      MessageSendingStatus.SENT ||
+                                  widget.message.status == null))
                             Align(
                               alignment: Alignment(
-                            user.id == message.user.id
+                                  user.id == widget.message.user.id
-                                ? (divFactor > 1.0 ? 0.0 : (1.0 - divFactor))
+                                      ? (divFactor > 1.0
-                                : (divFactor > 1.0 ? 0.0 : -(1.0 - divFactor)),
+                                          ? 0.0
+                                          : (1.0 - divFactor))
+                                      : (divFactor > 1.0
+                                          ? 0.0
+                                          : -(1.0 - divFactor)),
                                   0.0),
                               child: ReactionPicker(
-                          message: message,
+                                message: widget.message,
-                          messageTheme: messageTheme,
+                                messageTheme: widget.messageTheme,
                               ),
                             ),
-                    TweenAnimationBuilder<double>(
+                          IgnorePointer(
-                        tween: Tween(begin: 0.0, end: 1.0),
-                        duration: Duration(milliseconds: 300),
-                        builder: (context, val, snapshot) {
-                          return Transform.scale(
-                            scale: val,
-                            child: IgnorePointer(
                             child: MessageWidget(
                               key: Key('MessageWidget'),
-                                reverse: reverse,
+                              reverse: widget.reverse,
-                                message: message.copyWith(
+                              message: widget.message.copyWith(
-                                  text: message.text.length > 200
+                                text: widget.message.text.length > 200
-                                      ? '${message.text.substring(0, 200)}...'
+                                    ? '${widget.message.text.substring(0, 200)}...'
-                                      : message.text,
+                                    : widget.message.text,
                               ),
-                                messageTheme: messageTheme,
+                              messageTheme: widget.messageTheme,
                               showReactions: false,
                               showUsername: false,
                               showThreadReplyIndicator: false,
                               showReplyMessage: false,
-                                showUserAvatar: showUserAvatar,
+                              showUserAvatar: widget.showUserAvatar,
                               showTimestamp: false,
                               translateUserAvatar: false,
-                                showReactionPickerIndicator: showReactions &&
+                              showReactionPickerIndicator:
-                                    (message.status ==
+                                  widget.showReactions &&
+                                      (widget.message.status ==
                                               MessageSendingStatus.SENT ||
-                                        message.status == null),
+                                          widget.message.status == null),
                               showInChannelIndicator: false,
                               showSendingIndicator: false,
-                                shape: messageShape,
+                              shape: widget.messageShape,
                             ),
                           ),
-                          );
+                          Padding(
-                        }),
-                    TweenAnimationBuilder<double>(
-                        tween: Tween(begin: 0.0, end: 1.0),
-                        duration: Duration(milliseconds: 300),
-                        curve: Curves.easeInOut,
-                        builder: (context, val, wid) {
-                          return Transform(
-                            transform: Matrix4.identity()
-                              ..scale(val)
-                              ..rotateZ(-1.0 + val),
-                            alignment: reverse
-                                ? Alignment.topRight
-                                : Alignment.topLeft,
-                            child: Padding(
                             padding: EdgeInsets.only(
-                                right: reverse ? 16 : 0,
+                              right: widget.reverse ? 8 : 0,
-                                left: reverse ? 0 : 48,
+                              left: widget.reverse ? 0 : 48,
                             ),
                             child: SizedBox(
                               width: MediaQuery.of(context).size.width * 0.75,
@@ -180,25 +186,27 @@ class MessageActionsModal extends StatelessWidget {
                                         .greyWhisper,
                                     context: context,
                                     tiles: [
-                                        if (showReplyMessage &&
+                                      if (widget.showReplyMessage &&
-                                            (message.status ==
+                                          (widget.message.status ==
                                                   MessageSendingStatus.SENT ||
-                                                message.status == null) &&
+                                              widget.message.status == null) &&
-                                            message.parentId == null)
+                                          widget.message.parentId == null)
                                         _buildReplyButton(context),
-                                        if (showThreadReplyMessage &&
+                                      if (widget.showThreadReplyMessage &&
-                                            (message.status ==
+                                          (widget.message.status ==
                                                   MessageSendingStatus.SENT ||
-                                                message.status == null) &&
+                                              widget.message.status == null) &&
-                                            message.parentId == null)
+                                          widget.message.parentId == null)
                                         _buildThreadReplyButton(context),
-                                        if (showResendMessage)
+                                      if (widget.showResendMessage)
                                         _buildResendMessage(context),
-                                        if (showEditMessage)
+                                      if (widget.showEditMessage)
                                         _buildEditMessage(context),
-                                        if (showCopyMessage)
+                                      if (widget.showCopyMessage)
                                         _buildCopyButton(context),
-                                        if (showDeleteMessage)
+                                      if (widget.showFlagButton)
+                                        _buildFlagButton(context),
+                                      if (widget.showDeleteMessage)
                                         _buildDeleteButton(context),
                                     ],
                                   ).toList(),
@@ -206,15 +214,198 @@ class MessageActionsModal extends StatelessWidget {
                               ),
                             ),
                           ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
         );
-                        })
+      },
-                  ],
+    );
+  }
+
+  void _showFlagDialog() async {
+    final client = StreamChat.of(context).client;
+
+    var answer = await showConfirmationDialog(context,
+        title: 'Flag Message',
+        icon: StreamSvgIcon.flag(
+          color: StreamChatTheme.of(context).colorTheme.accentRed,
+          size: 24.0,
         ),
+        question:
+            'Do you want to send a copy of this message to a\nmoderator for further investigation?',
+        okText: 'FLAG',
+        cancelText: 'CANCEL');
+
+    if (answer) {
+      try {
+        await client.flagMessage(widget.message.id);
+        _showDismissAlert();
+      } catch (err) {
+        if (json.decode(err?.body ?? {})['code'] == 4) {
+          _showDismissAlert();
+        } else {
+          _showErrorAlert();
+        }
+      }
+    }
+  }
+
+  void _showDeleteDialog() async {
+    var answer = await showConfirmationDialog(context,
+        title: 'Delete message',
+        icon: StreamSvgIcon.flag(
+          color: StreamChatTheme.of(context).colorTheme.accentRed,
+          size: 24.0,
         ),
+        question: 'Are you sure you want to permanently delete this\nmessage?',
+        okText: 'DELETE',
+        cancelText: 'CANCEL');
+
+    if (answer) {
+      try {
+        Navigator.pop(context);
+        StreamChat.of(context).client.deleteMessage(
+              widget.message,
+              StreamChannel.of(context).channel.cid,
+            );
+      } catch (err) {
+        _showErrorAlert();
+      }
+    }
+  }
+
+  void _showDismissAlert() {
+    showModalBottomSheet(
+      backgroundColor: StreamChatTheme.of(context).colorTheme.white,
+      context: context,
+      shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.only(
+        topLeft: Radius.circular(16.0),
+        topRight: Radius.circular(16.0),
+      )),
+      builder: (context) {
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SizedBox(
+              height: 26.0,
             ),
+            StreamSvgIcon.flag(
+              color: StreamChatTheme.of(context).colorTheme.accentRed,
+              size: 24.0,
+            ),
+            SizedBox(
+              height: 26.0,
+            ),
+            Text(
+              'Message flagged',
+              style: StreamChatTheme.of(context).textTheme.headlineBold,
+            ),
+            SizedBox(
+              height: 7.0,
+            ),
+            Text('The message has been reported to a moderator.'),
+            SizedBox(
+              height: 36.0,
+            ),
+            Container(
+              color:
+                  StreamChatTheme.of(context).colorTheme.black.withOpacity(.08),
+              height: 1.0,
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                FlatButton(
+                  child: Text(
+                    'OK',
+                    style: StreamChatTheme.of(context)
+                        .textTheme
+                        .bodyBold
+                        .copyWith(
+                            color: StreamChatTheme.of(context)
+                                .colorTheme
+                                .accentBlue),
+                  ),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
                 ),
               ],
             ),
+          ],
+        );
+      },
+    );
+  }
+
+  void _showErrorAlert() {
+    showModalBottomSheet(
+      backgroundColor: StreamChatTheme.of(context).colorTheme.white,
+      context: context,
+      shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.only(
+        topLeft: Radius.circular(16.0),
+        topRight: Radius.circular(16.0),
+      )),
+      builder: (context) {
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SizedBox(
+              height: 26.0,
+            ),
+            StreamSvgIcon.error(
+              color: StreamChatTheme.of(context).colorTheme.accentRed,
+              size: 24.0,
+            ),
+            SizedBox(
+              height: 26.0,
+            ),
+            Text(
+              'Something went wrong',
+              style: StreamChatTheme.of(context).textTheme.headlineBold,
+            ),
+            SizedBox(
+              height: 7.0,
+            ),
+            Text('The operation couldn\'t be completed.'),
+            SizedBox(
+              height: 36.0,
+            ),
+            Container(
+              color:
+                  StreamChatTheme.of(context).colorTheme.black.withOpacity(.08),
+              height: 1.0,
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                FlatButton(
+                  child: Text(
+                    'OK',
+                    style: StreamChatTheme.of(context)
+                        .textTheme
+                        .bodyBold
+                        .copyWith(
+                            color: StreamChatTheme.of(context)
+                                .colorTheme
+                                .accentBlue),
+                  ),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
+                ),
+              ],
+            ),
+          ],
+        );
+      },
     );
   }
 
@@ -235,15 +426,35 @@ class MessageActionsModal extends StatelessWidget {
       ),
       onTap: () {
         Navigator.pop(context);
-        if (onReplyTap != null) {
+        if (widget.onReplyTap != null) {
-          onReplyTap(message);
+          widget.onReplyTap(widget.message);
         }
       },
     );
   }
 
+  Widget _buildFlagButton(BuildContext context) {
+    return ListTile(
+      dense: true,
+      title: Row(
+        children: [
+          StreamSvgIcon.icon_flag(
+            color: StreamChatTheme.of(context).primaryIconTheme.color,
+          ),
+          const SizedBox(width: 16),
+          Text(
+            'Flag',
+            style: StreamChatTheme.of(context).textTheme.headline,
+          ),
+        ],
+      ),
+      onTap: () => _showFlagDialog(),
+    );
+  }
+
   Widget _buildDeleteButton(BuildContext context) {
-    final isDeleteFailed = message.status == MessageSendingStatus.FAILED_DELETE;
+    final isDeleteFailed =
+        widget.message.status == MessageSendingStatus.FAILED_DELETE;
     return ListTile(
       dense: true,
       title: Row(
@@ -262,11 +473,7 @@ class MessageActionsModal extends StatelessWidget {
         ],
       ),
       onTap: () {
-        Navigator.pop(context);
+        _showDeleteDialog();
-        StreamChat.of(context).client.deleteMessage(
-              message,
-              StreamChannel.of(context).channel.cid,
-            );
       },
     );
   }
@@ -288,7 +495,7 @@ class MessageActionsModal extends StatelessWidget {
         ],
       ),
       onTap: () async {
-        await Clipboard.setData(ClipboardData(text: message.text));
+        await Clipboard.setData(ClipboardData(text: widget.message.text));
         Navigator.pop(context);
       },
     );
@@ -317,7 +524,8 @@ class MessageActionsModal extends StatelessWidget {
   }
 
   Widget _buildResendMessage(BuildContext context) {
-    final isUpdateFailed = message.status == MessageSendingStatus.FAILED_UPDATE;
+    final isUpdateFailed =
+        widget.message.status == MessageSendingStatus.FAILED_UPDATE;
     return ListTile(
       dense: true,
       title: Row(
@@ -337,9 +545,9 @@ class MessageActionsModal extends StatelessWidget {
         final client = StreamChat.of(context).client;
         final channel = StreamChannel.of(context).channel;
         if (isUpdateFailed) {
-          client.updateMessage(message, channel.cid);
+          client.updateMessage(widget.message, channel.cid);
         } else {
-          channel.sendMessage(message);
+          channel.sendMessage(widget.message);
         }
       },
     );
@@ -396,10 +604,10 @@ class MessageActionsModal extends StatelessWidget {
                 padding: EdgeInsets.only(
                   bottom: MediaQuery.of(context).viewInsets.bottom,
                 ),
-                child: editMessageInputBuilder != null
+                child: widget.editMessageInputBuilder != null
-                    ? editMessageInputBuilder(context, message)
+                    ? widget.editMessageInputBuilder(context, widget.message)
                     : MessageInput(
-                        editMessage: message,
+                        editMessage: widget.message,
                         preMessageSending: (m) {
                           FocusScope.of(context).unfocus();
                           Navigator.pop(context);
@@ -431,8 +639,8 @@ class MessageActionsModal extends StatelessWidget {
       ),
       onTap: () {
         Navigator.pop(context);
-        if (onThreadReplyTap != null) {
+        if (widget.onThreadReplyTap != null) {
-          onThreadReplyTap(message);
+          widget.onThreadReplyTap(widget.message);
         }
       },
     );

lib/src/message_input.dart

@@ -203,6 +203,8 @@ class MessageInputState extends State<MessageInput> {
   bool _openFilePickerSection = false;
   int _filePickerIndex = 0;
   double _filePickerSize = _kMinMediaPickerSize;
+  KeyboardVisibilityController _keyboardVisibilityController =
+      KeyboardVisibilityController();
 
   /// The editing controller passed to the input TextField
   TextEditingController textEditingController;
@@ -358,8 +360,10 @@ class MessageInputState extends State<MessageInput> {
     );
   }
 
-  AnimatedCrossFade _animateSendButton(BuildContext context) {
+  Widget _animateSendButton(BuildContext context) {
-    return AnimatedCrossFade(
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: AnimatedCrossFade(
         crossFadeState: ((_messageIsPresent || _attachments.isNotEmpty) &&
                 _attachments.every((a) => a.uploaded == true))
             ? CrossFadeState.showFirst
@@ -368,21 +372,19 @@ class MessageInputState extends State<MessageInput> {
         secondChild: _buildIdleSendButton(context),
         duration: Duration(milliseconds: 300),
         alignment: Alignment.center,
+      ),
     );
   }
 
   Widget _buildExpandActionsButton() {
-    return AnimatedCrossFade(
+    return Padding(
-      crossFadeState:
+      padding: const EdgeInsets.all(8.0),
-          _actionsShrunk ? CrossFadeState.showFirst : CrossFadeState.showSecond,
+      child: AnimatedCrossFade(
-      firstChild: Padding(
+        crossFadeState: _actionsShrunk
-        padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
+            ? CrossFadeState.showFirst
-        child: IconButton(
+            : CrossFadeState.showSecond,
-          onPressed: () {
+        firstChild: IconButton(
-            setState(() {
+          onPressed: () => setState(() => _actionsShrunk = false),
-              _actionsShrunk = false;
-            });
-          },
           icon: StreamSvgIcon.emptyCircleLeft(
             color: StreamChatTheme.of(context).colorTheme.accentBlue,
           ),
@@ -393,34 +395,36 @@ class MessageInputState extends State<MessageInput> {
           ),
           splashRadius: 24,
         ),
-      ),
         secondChild: Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: [
             if (!widget.disableAttachments) _buildAttachmentButton(),
             if (widget.editMessage == null &&
-              StreamChannel.of(context).channel?.config?.commands?.isNotEmpty ==
+                StreamChannel.of(context)
+                        .channel
+                        ?.config
+                        ?.commands
+                        ?.isNotEmpty ==
                     true)
               _buildCommandButton(),
-        ],
+          ].insertBetween(const SizedBox(width: 8)),
         ),
         duration: Duration(milliseconds: 300),
         alignment: Alignment.center,
+      ),
     );
   }
 
   Expanded _buildTextInput(BuildContext context) {
+    final theme = StreamChatTheme.of(context);
     return Expanded(
       child: Center(
         child: Container(
           clipBehavior: Clip.antiAlias,
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(24.0),
+            borderRadius: BorderRadius.circular(20.0),
-            border: Border.all(
+            border: Border.all(color: theme.colorTheme.greyGainsboro),
-              color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
           ),
-          ),
-          padding: _attachments.isEmpty ? null : EdgeInsets.all(6.0),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -429,24 +433,26 @@ class MessageInputState extends State<MessageInput> {
               _buildAttachments(),
               LimitedBox(
                 maxHeight: widget.maxHeight,
+                child: SizedBox(
+                  height: 40,
                   child: TextField(
                     key: Key('messageInputText'),
                     enabled: _inputEnabled,
                     minLines: null,
                     maxLines: null,
-                  onSubmitted: (_) {
+                    onSubmitted: (_) => sendMessage(),
-                    sendMessage();
-                  },
                     keyboardType: widget.keyboardType,
                     controller: textEditingController,
                     focusNode: _focusNode,
-                  style: Theme.of(context).textTheme.bodyText2,
+                    style: theme.textTheme.body,
                     autofocus: false,
                     textAlignVertical: TextAlignVertical.center,
                     decoration: InputDecoration(
                       isDense: true,
                       hintText: _getHint(),
-                    prefixText: _commandEnabled ? null : '   ',
+                      hintStyle: theme.textTheme.body.copyWith(
+                        color: theme.colorTheme.grey,
+                      ),
                       border: OutlineInputBorder(
                           borderSide: BorderSide(color: Colors.transparent)),
                       focusedBorder: OutlineInputBorder(
@@ -457,24 +463,18 @@ class MessageInputState extends State<MessageInput> {
                           borderSide: BorderSide(color: Colors.transparent)),
                       disabledBorder: OutlineInputBorder(
                           borderSide: BorderSide(color: Colors.transparent)),
-                    contentPadding: EdgeInsets.symmetric(
+                      contentPadding: const EdgeInsets.fromLTRB(16, 12, 13, 11),
-                      horizontal: 16,
-                      vertical: 13,
-                    ),
                       prefixIcon: _commandEnabled
-                        ? Padding(
+                          ? Container(
-                            padding:
+                              decoration: BoxDecoration(
-                                const EdgeInsets.symmetric(horizontal: 8.0),
+                                borderRadius: BorderRadius.circular(12),
-                            child: Chip(
+                                color: theme.colorTheme.accentBlue,
-                              backgroundColor: StreamChatTheme.of(context)
+                              ),
-                                  .colorTheme
+                              height: 24,
-                                  .accentBlue,
+                              margin: const EdgeInsets.all(8.0),
-                              padding: EdgeInsets.zero,
+                              padding: const EdgeInsets.only(right: 8, left: 4),
-                              labelPadding:
+                              child: Row(
-                                  EdgeInsets.symmetric(horizontal: 8.0),
-                              label: Row(
                                 mainAxisSize: MainAxisSize.min,
-                                mainAxisAlignment: MainAxisAlignment.center,
                                 children: [
                                   StreamSvgIcon.lightning(
                                     color: Colors.white,
@@ -484,20 +484,24 @@ class MessageInputState extends State<MessageInput> {
                                     _chosenCommand?.name?.toUpperCase() ?? '',
                                     style: StreamChatTheme.of(context)
                                         .textTheme
-                                        .footnote
+                                        .footnoteBold
                                         .copyWith(
                                           color: Colors.white,
                                         ),
                                   ),
                                 ],
                               ),
-                            ),
                             )
                           : null,
                       suffixIcon: _commandEnabled
                           ? IconButton(
                               icon: StreamSvgIcon.close_small(),
                               splashRadius: 24,
+                              padding: const EdgeInsets.all(0),
+                              constraints: BoxConstraints.tightFor(
+                                height: 24,
+                                width: 24,
+                              ),
                               onPressed: () {
                                 setState(() => _commandEnabled = false);
                               },
@@ -506,6 +510,7 @@ class MessageInputState extends State<MessageInput> {
                     ),
                     textCapitalization: TextCapitalization.sentences,
                   ),
+                ),
               )
             ],
           ),
@@ -1515,28 +1520,28 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Widget _buildReplyToMessage() {
-    if (!_hasQuotedMessage) {
+    if (!_hasQuotedMessage) return Offstage();
-      return Offstage();
-    }
     final containsUrl = widget.quotedMessage.attachments
             ?.any((element) => element.ogScrapeUrl != null) ==
         true;
     return Transform(
       transform: Matrix4.rotationY(pi),
       alignment: Alignment.center,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
         child: QuotedMessageWidget(
           reverse: true,
           showBorder: !containsUrl,
           message: widget.quotedMessage,
           messageTheme: StreamChatTheme.of(context).otherMessageTheme,
         ),
+      ),
     );
   }
 
   Widget _buildAttachments() {
-    return _attachments.isEmpty
+    if (_attachments.isEmpty) return Offstage();
-        ? Container()
+    return Column(
-        : Column(
       children: [
         if (_attachments.any((e) => e.attachment?.type == 'file'))
           LimitedBox(
@@ -1548,8 +1553,7 @@ class MessageInputState extends State<MessageInput> {
                   .where((e) => e.attachment?.type == 'file')
                   .map(
                     (e) => Padding(
-                            padding:
+                      padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                                const EdgeInsets.symmetric(horizontal: 8.0),
                       child: ClipRRect(
                         borderRadius: BorderRadius.circular(10),
                         clipBehavior: Clip.antiAlias,
@@ -1565,8 +1569,7 @@ class MessageInputState extends State<MessageInput> {
                             padding: const EdgeInsets.all(8.0),
                             child: InkWell(
                               child: CircleAvatar(
-                                      backgroundColor:
+                                backgroundColor: StreamChatTheme.of(context)
-                                          StreamChatTheme.of(context)
                                     .colorTheme
                                     .black
                                     .withOpacity(0.6),
@@ -1620,10 +1623,8 @@ class MessageInputState extends State<MessageInput> {
                                 : Positioned.fill(
                                     child: Center(
                                       child: Padding(
-                                              padding:
+                                        padding: const EdgeInsets.all(16.0),
-                                                  const EdgeInsets.all(16.0),
+                                        child: CircularProgressIndicator(),
-                                              child:
-                                                  CircularProgressIndicator(),
                                       ),
                                     ),
                                   ),
@@ -1746,9 +1747,7 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Widget _buildCommandButton() {
-    return Padding(
+    return IconButton(
-      padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
-      child: IconButton(
       icon: StreamSvgIcon.lightning(
         color: _commandsOverlay != null
             ? StreamChatTheme.of(context).colorTheme.accentBlue
@@ -1782,14 +1781,11 @@ class MessageInputState extends State<MessageInput> {
           });
         }
       },
-      ),
     );
   }
 
   Widget _buildAttachmentButton() {
-    return Padding(
+    return IconButton(
-      padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
-      child: IconButton(
       icon: StreamSvgIcon.attach(
         color: _openFilePickerSection
             ? StreamChatTheme.of(context).colorTheme.accentBlue
@@ -1819,7 +1815,6 @@ class MessageInputState extends State<MessageInput> {
           showAttachmentModal();
         }
       },
-      ),
     );
   }
 
@@ -2118,21 +2113,15 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Widget _buildIdleSendButton(BuildContext context) {
-    return Padding(
+    return StreamSvgIcon(
-      padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
-      child: StreamSvgIcon(
       assetName: _getIdleSendIcon(),
       color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
-      ),
     );
   }
 
   Widget _buildSendButton(BuildContext context) {
-    return Padding(
+    return IconButton(
-      padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
-      child: IconButton(
       onPressed: sendMessage,
-        visualDensity: VisualDensity.compact,
       padding: const EdgeInsets.all(0),
       splashRadius: 24,
       constraints: BoxConstraints.tightFor(
@@ -2143,7 +2132,6 @@ class MessageInputState extends State<MessageInput> {
         assetName: _getSendIcon(),
         color: StreamChatTheme.of(context).colorTheme.accentBlue,
       ),
-      ),
     );
   }
 
@@ -2263,7 +2251,8 @@ class MessageInputState extends State<MessageInput> {
     _emojiNames = Emoji.all().map((e) => e.name);
 
     if (!kIsWeb) {
-      _keyboardListener = KeyboardVisibility.onChange.listen((visible) {
+      _keyboardListener =
+          _keyboardVisibilityController.onChange.listen((visible) {
         if (_focusNode.hasFocus) {
           _onChanged(context, textEditingController.text);
         }

lib/src/message_list_view.dart

@@ -18,6 +18,7 @@ import '../stream_chat_flutter.dart';
 import 'date_divider.dart';
 import 'stream_channel.dart';
 import 'swipeable.dart';
+import 'extension.dart';
 
 typedef MessageBuilder = Widget Function(
   BuildContext,
@@ -306,32 +307,7 @@ class _MessageListViewState extends State<MessageListView> {
           return Stack(
             alignment: Alignment.center,
             children: [
-              ValueListenableBuilder<ConnectionStatus>(
+              LazyLoadScrollView(
-                  valueListenable: _client.wsConnectionStatus,
-                  builder: (context, status, _) {
-                    String statusString = '';
-                    bool showStatus = true;
-
-                    switch (status) {
-                      case ConnectionStatus.connected:
-                        statusString = 'Connected';
-                        showStatus = false;
-                        break;
-                      case ConnectionStatus.connecting:
-                        statusString = 'Reconnecting...';
-                        break;
-                      case ConnectionStatus.disconnected:
-                        statusString = 'Disconnected';
-                        break;
-                    }
-
-                    return InfoTile(
-                      showMessage:
-                          widget.showConnectionStateTile ? showStatus : false,
-                      tileAnchor: Alignment.topCenter,
-                      childAnchor: Alignment.topCenter,
-                      message: statusString,
-                      child: LazyLoadScrollView(
                 onStartOfPage: () async {
                   _inBetweenList = false;
                   if (!_upToDate) {
@@ -364,14 +340,32 @@ class _MessageListViewState extends State<MessageListView> {
                   physics: widget.scrollPhysics,
                   itemScrollController: _scrollController,
                   reverse: true,
-                          itemCount: messages.length +
+                  itemCount:
-                              2 +
+                      messages.length + 2 + (_isThreadConversation ? 1 : 0),
-                              (_isThreadConversation ? 1 : 0),
                   separatorBuilder: (context, i) {
                     if (i == messages.length) return Offstage();
-                            if (i == messages.length + 2) return Offstage();
-                            if (i == messages.length + 1) return Offstage();
                     if (i == 0) return SizedBox(height: 30);
+                    if (i == messages.length + 1) {
+                      final replyCount = widget.parentMessage.replyCount;
+                      return Container(
+                        decoration: BoxDecoration(
+                          gradient:
+                              StreamChatTheme.of(context).colorTheme.bgGradient,
+                        ),
+                        child: Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: Text(
+                            '$replyCount ${replyCount == 1 ? 'Reply' : 'Replies'}',
+                            textAlign: TextAlign.center,
+                            style: StreamChatTheme.of(context)
+                                .channelTheme
+                                .channelHeaderTheme
+                                .lastMessageAt,
+                          ),
+                        ),
+                      );
+                    }
+
                     final message = messages[i];
                     final nextMessage = messages[i - 1];
                     if (!Jiffy(message.createdAt.toLocal()).isSame(
@@ -386,8 +380,7 @@ class _MessageListViewState extends State<MessageListView> {
                               dateTime: nextMessage.createdAt.toLocal(),
                             );
                       return Padding(
-                                padding:
+                        padding: const EdgeInsets.symmetric(vertical: 12.0),
-                                    const EdgeInsets.symmetric(vertical: 12.0),
                         child: divider,
                       );
                     }
@@ -417,31 +410,7 @@ class _MessageListViewState extends State<MessageListView> {
                           widget.parentMessage,
                         );
                       } else {
-                                return Column(
+                        return buildParentMessage(widget.parentMessage);
-                                  crossAxisAlignment:
-                                      CrossAxisAlignment.stretch,
-                                  children: <Widget>[
-                                    buildParentMessage(widget.parentMessage),
-                                    Container(
-                                      decoration: BoxDecoration(
-                                        gradient: StreamChatTheme.of(context)
-                                            .colorTheme
-                                            .bgGradient,
-                                      ),
-                                      child: Padding(
-                                        padding: const EdgeInsets.all(8.0),
-                                        child: Text(
-                                          '${widget.parentMessage.replyCount} ${widget.parentMessage.replyCount == 1 ? 'Reply' : 'Replies'}',
-                                          textAlign: TextAlign.center,
-                                          style: StreamChatTheme.of(context)
-                                              .channelTheme
-                                              .channelHeaderTheme
-                                              .lastMessageAt,
-                                        ),
-                                      ),
-                                    ),
-                                  ],
-                                );
                       }
                     }
                     if (i == messages.length + 1) {
@@ -655,7 +624,7 @@ class _MessageListViewState extends State<MessageListView> {
           );
         }
         if (!snapshot.data) {
-            if (direction == QueryDirection.top) {
+          if (!_isThreadConversation && direction == QueryDirection.top) {
             return Container(
               height: 52,
               width: double.infinity,
@@ -669,7 +638,8 @@ class _MessageListViewState extends State<MessageListView> {
             child: const CircularProgressIndicator(),
           ),
         );
-        });
+      },
+    );
   }
 
   Widget _buildTopMessage(
@@ -748,6 +718,7 @@ class _MessageListViewState extends State<MessageListView> {
     Message message,
   ) {
     final isMyMessage = message.user.id == StreamChat.of(context).user.id;
+    final isOnlyEmoji = message.text.isOnlyEmoji;
 
     return MessageWidget(
       showThreadReplyIndicator: false,
@@ -761,12 +732,7 @@ class _MessageListViewState extends State<MessageListView> {
       message: message,
       reverse: isMyMessage,
       showUsername: !isMyMessage,
-      padding: EdgeInsets.only(
+      padding: const EdgeInsets.all(8.0),
-        top: 8.0,
-        left: 8.0,
-        right: 8.0,
-        bottom: 16.0,
-      ),
       showSendingIndicator: false,
       onThreadTap: _onThreadTap,
       borderRadiusGeometry: BorderRadius.only(
@@ -775,7 +741,7 @@ class _MessageListViewState extends State<MessageListView> {
         topRight: Radius.circular(16),
         bottomRight: Radius.circular(16),
       ),
-      borderSide: isMyMessage ? BorderSide.none : null,
+      borderSide: isMyMessage || isOnlyEmoji ? BorderSide.none : null,
       showUserAvatar: isMyMessage ? DisplayWidget.gone : DisplayWidget.show,
       messageTheme: isMyMessage
           ? StreamChatTheme.of(context).ownMessageTheme
@@ -850,8 +816,19 @@ class _MessageListViewState extends State<MessageListView> {
     final showSendingIndicator =
         isMyMessage && (index == 0 || timeDiff >= 1 || !isNextUserSame);
 
-    bool showInChannelIndicator = !_isThreadConversation && isThreadMessage;
+    final showInChannelIndicator = !_isThreadConversation && isThreadMessage;
-    bool showThreadReplyIndicator = !_isThreadConversation && hasReplies;
+    final showThreadReplyIndicator = !_isThreadConversation && hasReplies;
+    final isOnlyEmoji = message.text.isOnlyEmoji;
+
+    final showMessageBorder =
+        showThreadReplyIndicator || showInChannelIndicator;
+    final borderSide = isMyMessage
+        ? !showMessageBorder
+            ? BorderSide.none
+            : null
+        : isOnlyEmoji && !showMessageBorder
+            ? BorderSide.none
+            : null;
 
     Widget child = MessageWidget(
       key: ValueKey<String>('MESSAGE-${message.id}'),
@@ -888,20 +865,28 @@ class _MessageListViewState extends State<MessageListView> {
       showEditMessage: isMyMessage,
       showDeleteMessage: isMyMessage,
       showThreadReplyMessage: !isThreadMessage,
-      borderSide: isMyMessage ? BorderSide.none : null,
+      showFlagButton: !isMyMessage,
+      borderSide: borderSide,
       onThreadTap: _onThreadTap,
       onReplyTap: widget.onReplyTap,
       attachmentBorderRadiusGeometry: BorderRadius.only(
         topLeft: Radius.circular(attachmentBorderRadius),
         bottomLeft: Radius.circular(
-            timeDiff >= 1 || !isNextUserSame ? 0 : attachmentBorderRadius),
+          (timeDiff >= 1 || !isNextUserSame) && !(hasReplies || isThreadMessage)
+              ? 0
+              : attachmentBorderRadius,
+        ),
         topRight: Radius.circular(attachmentBorderRadius),
         bottomRight: Radius.circular(attachmentBorderRadius),
       ),
       attachmentPadding: const EdgeInsets.all(2),
       borderRadiusGeometry: BorderRadius.only(
         topLeft: Radius.circular(16),
-        bottomLeft: Radius.circular(timeDiff >= 1 || !isNextUserSame ? 0 : 16),
+        bottomLeft: Radius.circular(
+          (timeDiff >= 1 || !isNextUserSame) && !(hasReplies || isThreadMessage)
+              ? 0
+              : 16,
+        ),
         topRight: Radius.circular(16),
         bottomRight: Radius.circular(16),
       ),

lib/src/message_reactions_modal.dart

@@ -56,6 +56,11 @@ class MessageReactionsModal extends StatelessWidget {
         ? 1
         : (roughSentenceSize == 0 ? 1 : (roughSentenceSize / roughMaxSize));
 
+    return TweenAnimationBuilder<double>(
+      tween: Tween(begin: 0.0, end: 1.0),
+      duration: Duration(milliseconds: 300),
+      curve: Curves.easeInOutBack,
+      builder: (context, val, snapshot) {
         return GestureDetector(
           behavior: HitTestBehavior.translucent,
           onTap: () => Navigator.maybePop(context),
@@ -72,7 +77,9 @@ class MessageReactionsModal extends StatelessWidget {
                   ),
                 ),
               ),
-          Center(
+              Transform.scale(
+                scale: val,
+                child: Center(
                   child: SingleChildScrollView(
                     child: Padding(
                       padding: const EdgeInsets.symmetric(vertical: 8.0),
@@ -86,21 +93,19 @@ class MessageReactionsModal extends StatelessWidget {
                             Align(
                               alignment: Alignment(
                                   user.id == message.user.id
-                                ? (divFactor > 1.0 ? 0.0 : (1.0 - divFactor))
+                                      ? (divFactor > 1.0
-                                : (divFactor > 1.0 ? 0.0 : -(1.0 - divFactor)),
+                                          ? 0.0
+                                          : (1.0 - divFactor))
+                                      : (divFactor > 1.0
+                                          ? 0.0
+                                          : -(1.0 - divFactor)),
                                   0.0),
                               child: ReactionPicker(
                                 message: message,
                                 messageTheme: messageTheme,
                               ),
                             ),
-                    TweenAnimationBuilder<double>(
+                          IgnorePointer(
-                        tween: Tween(begin: 0.0, end: 1.0),
-                        duration: Duration(milliseconds: 300),
-                        builder: (context, val, snapshot) {
-                          return Transform.scale(
-                            scale: val,
-                            child: IgnorePointer(
                             child: MessageWidget(
                               key: Key('MessageWidget'),
                               reverse: reverse,
@@ -125,8 +130,6 @@ class MessageReactionsModal extends StatelessWidget {
                                       message.status == null),
                             ),
                           ),
-                          );
-                        }),
                           if (message.latestReactions?.isNotEmpty == true)
                             _buildReactionCard(context),
                         ],
@@ -134,9 +137,12 @@ class MessageReactionsModal extends StatelessWidget {
                     ),
                   ),
                 ),
+              ),
             ],
           ),
         );
+      },
+    );
   }
 
   Padding _buildReactionCard(BuildContext context) {
@@ -191,14 +197,7 @@ class MessageReactionsModal extends StatelessWidget {
     BuildContext context,
   ) {
     final isCurrentUser = reaction.user.id == currentUser.id;
-    return TweenAnimationBuilder<double>(
+    return ConstrainedBox(
-        tween: Tween(begin: 0.0, end: 1.0),
-        duration: Duration(milliseconds: 300),
-        curve: Curves.easeInOut,
-        builder: (context, val, snapshot) {
-          return Transform.scale(
-            scale: val,
-            child: ConstrainedBox(
       constraints: BoxConstraints.loose(Size(
         64,
         98,
@@ -221,15 +220,13 @@ class MessageReactionsModal extends StatelessWidget {
               ),
               Positioned(
                 child: Align(
-                          alignment: reverse
+                  alignment:
-                              ? Alignment.centerRight
+                      reverse ? Alignment.centerRight : Alignment.centerLeft,
-                              : Alignment.centerLeft,
                   child: ReactionBubble(
                     reactions: [reaction],
                     flipTail: !reverse,
                     borderColor: messageTheme.reactionsBorderColor,
-                            backgroundColor:
+                    backgroundColor: messageTheme.reactionsBackgroundColor,
-                                messageTheme.reactionsBackgroundColor,
                     highlightOwnReactions: false,
                   ),
                 ),
@@ -247,8 +244,6 @@ class MessageReactionsModal extends StatelessWidget {
           ),
         ],
       ),
-            ),
     );
-        });
   }
 }

lib/src/message_widget.dart

@@ -132,6 +132,7 @@ class MessageWidget extends StatefulWidget {
   final bool showDeleteMessage;
   final bool showResendMessage;
 
+  final bool showFlagButton;
   final Map<String, AttachmentBuilder> attachmentBuilders;
 
   /// Center user avatar with bottom of the message
@@ -170,6 +171,7 @@ class MessageWidget extends StatefulWidget {
     this.showThreadReplyMessage = true,
     this.showResendMessage = true,
     this.showCopyMessage = true,
+    this.showFlagButton = true,
     this.onUserAvatarTap,
     this.onLinkTap,
     this.onMessageActions,
@@ -270,6 +272,12 @@ class _MessageWidgetState extends State<MessageWidget> {
       widget.message.attachments?.any((element) => element.type == 'giphy') ==
       true;
 
+  bool get hasNonUrlAttachments =>
+      widget.message.attachments
+          ?.where((it) => it.ogScrapeUrl == null)
+          ?.isNotEmpty ==
+      true;
+
   bool get showBottomRow =>
       showThreadReplyIndicator ||
       showUsername ||
@@ -383,11 +391,8 @@ class _MessageWidgetState extends State<MessageWidget> {
                                                   ),
                                                   shape: widget.shape ??
                                                       RoundedRectangleBorder(
-                                                        side: isOnlyEmoji &&
+                                                        side:
-                                                                !(showThreadReplyIndicator ||
+                                                            widget.borderSide ??
-                                                                    showInChannel)
-                                                            ? BorderSide.none
-                                                            : widget.borderSide ??
                                                                 BorderSide(
                                                                   color: widget
                                                                       .messageTheme
@@ -410,6 +415,7 @@ class _MessageWidgetState extends State<MessageWidget> {
                                                       children: <Widget>[
                                                         if (hasQuotedMessage)
                                                           _buildQuotedMessage(),
+                                                        if (hasNonUrlAttachments)
                                                           ..._parseAttachments(
                                                               context),
                                                         if (widget.message.text
@@ -426,7 +432,7 @@ class _MessageWidgetState extends State<MessageWidget> {
                                         if (widget.showReactionPickerIndicator)
                                           Positioned(
                                             right: 0,
-                                            top: -6,
+                                            top: -8,
                                             child: Transform(
                                               transform: Matrix4.rotationY(
                                                   widget.reverse ? pi : 0),
@@ -488,13 +494,21 @@ class _MessageWidgetState extends State<MessageWidget> {
             widget.onQuotedMessageTap != null
         ? () => widget.onQuotedMessageTap(widget.message.quotedMessageId)
         : null;
-    return QuotedMessageWidget(
+    return Padding(
+      padding: EdgeInsets.only(
+        right: 8,
+        left: 8,
+        top: 8,
+        bottom: hasNonUrlAttachments ? 8 : 0,
+      ),
+      child: QuotedMessageWidget(
         onTap: onTap,
         message: widget.message.quotedMessage,
         messageTheme: isMyMessage
             ? StreamChatTheme.of(context).otherMessageTheme
             : StreamChatTheme.of(context).ownMessageTheme,
         reverse: widget.reverse,
+      ),
     );
   }
 
@@ -689,6 +703,7 @@ class _MessageWidgetState extends State<MessageWidget> {
 
   void _showMessageActionModalBottomSheet(BuildContext context) {
     final channel = StreamChannel.of(context).channel;
+
     showDialog(
         context: context,
         barrierColor: StreamChatTheme.of(context).colorTheme.overlay,
@@ -725,6 +740,7 @@ class _MessageWidgetState extends State<MessageWidget> {
               showThreadReplyMessage: widget.showThreadReplyMessage &&
                   !isFailedState &&
                   widget.onThreadTap != null,
+              showFlagButton: widget.showFlagButton,
             ),
           );
         });
@@ -923,7 +939,7 @@ class _MessageWidgetState extends State<MessageWidget> {
                         ? widget.messageTheme.copyWith(
                             messageText:
                                 widget.messageTheme.messageText.copyWith(
-                            fontSize: 40,
+                            fontSize: 42,
                           ))
                         : widget.messageTheme,
                   ),
@@ -938,7 +954,7 @@ class _MessageWidgetState extends State<MessageWidget> {
     );
   }
 
-  bool get isOnlyEmoji => textIsOnlyEmoji(widget.message.text);
+  bool get isOnlyEmoji => widget.message.text.isOnlyEmoji;
 
   Color _getBackgroundColor() {
     if (hasQuotedMessage) {

lib/src/quoted_message_widget.dart

@@ -109,23 +109,20 @@ class QuotedMessageWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return InkWell(
       onTap: onTap,
-      child: Padding(
-        padding: const EdgeInsets.only(top: 8, right: 4, left: 8),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.end,
         mainAxisSize: MainAxisSize.min,
         children: [
           Flexible(child: _buildMessage(context)),
-            SizedBox(width: 4),
+          SizedBox(width: 8),
           _buildUserAvatar(),
         ],
       ),
-      ),
     );
   }
 
   Widget _buildMessage(BuildContext context) {
-    final isOnlyEmoji = textIsOnlyEmoji(message.text);
+    final isOnlyEmoji = message.text.isOnlyEmoji;
     var msg = _hasAttachments && !_containsText
         ? message.copyWith(text: message.attachments.last?.title ?? '')
         : message;
@@ -145,9 +142,12 @@ class QuotedMessageWidget extends StatelessWidget {
               messageTheme: isOnlyEmoji && _containsText
                   ? messageTheme.copyWith(
                       messageText: messageTheme.messageText.copyWith(
-                      fontSize: 24,
+                      fontSize: 32,
                     ))
-                  : messageTheme,
+                  : messageTheme.copyWith(
+                      messageText: messageTheme.messageText.copyWith(
+                      fontSize: 12,
+                    )),
             ),
           ),
         ),
@@ -235,9 +235,7 @@ class QuotedMessageWidget extends StatelessWidget {
 
   ShapeBorder _getDefaultShape(BuildContext context) {
     return RoundedRectangleBorder(
-      side: BorderSide(
+      side: BorderSide(width: 0.0, color: Colors.transparent),
-        color: StreamChatTheme.of(context).colorTheme.greyWhisper,
-      ),
       borderRadius: BorderRadius.circular(8),
     );
   }
@@ -246,8 +244,6 @@ class QuotedMessageWidget extends StatelessWidget {
     return Transform(
       transform: Matrix4.rotationY(reverse ? pi : 0),
       alignment: Alignment.center,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 4.0),
       child: UserAvatar(
         user: message.user,
         constraints: BoxConstraints.tightFor(
@@ -256,7 +252,6 @@ class QuotedMessageWidget extends StatelessWidget {
         ),
         showOnlineStatus: false,
       ),
-      ),
     );
   }
 

lib/src/reaction_picker.dart

@@ -1,8 +1,11 @@
+import 'dart:math';
+
 import 'package:ezanimation/ezanimation.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/src/stream_svg_icon.dart';
 
 import '../stream_chat_flutter.dart';
+import 'extension.dart';
 
 /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/reaction_picker.png)
 /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/reaction_picker_paint.png)
@@ -36,13 +39,10 @@ class _ReactionPickerState extends State<ReactionPicker>
     if (animations.isEmpty && reactionIcons.isNotEmpty) {
       reactionIcons.forEach((element) {
         animations.add(
-          EzAnimation.sequence(
+          EzAnimation.tween(
-            [
+            Tween(begin: 0.0, end: 1.0),
-              SequenceItem(0.0, 1.4),
-              SequenceItem(1.4, 1.0),
-            ],
             Duration(milliseconds: 500),
-            vsync: this,
+            curve: Curves.easeInOutBack,
           ),
         );
       });
@@ -52,44 +52,64 @@ class _ReactionPickerState extends State<ReactionPicker>
 
     return TweenAnimationBuilder<double>(
         tween: Tween(begin: 0.0, end: 1.0),
-        curve: Curves.easeInOutExpo,
+        curve: Curves.easeInOutBack,
         duration: Duration(milliseconds: 500),
         builder: (context, val, wid) {
           return Transform.scale(
             scale: val,
             child: Material(
+              borderRadius: BorderRadius.circular(24),
               color: StreamChatTheme.of(context).colorTheme.white,
               clipBehavior: Clip.hardEdge,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(24),
-              ),
               child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16.0,
+                  vertical: 8.0,
+                ),
                 child: Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisAlignment: MainAxisAlignment.end,
                   mainAxisSize: MainAxisSize.min,
-                  children: reactionIcons.map((reactionIcon) {
+                  children: reactionIcons
+                      .map<Widget>((reactionIcon) {
                         final ownReactionIndex = widget.message.ownReactions
                                 ?.indexWhere((reaction) =>
                                     reaction.type == reactionIcon.type) ??
                             -1;
                         var index = reactionIcons.indexOf(reactionIcon);
 
-                    return IconButton(
+                        return ConstrainedBox(
-                      iconSize: 24,
+                          constraints: BoxConstraints.tightFor(
-                      icon: AnimatedBuilder(
+                            height: 24,
+                            width: 24,
+                          ),
+                          child: RawMaterialButton(
+                            elevation: 0,
+                            padding: const EdgeInsets.all(0),
+                            clipBehavior: Clip.none,
+                            shape: ContinuousRectangleBorder(
+                              borderRadius: BorderRadius.circular(16),
+                            ),
+                            constraints: BoxConstraints.tightFor(
+                              height: 24,
+                              width: 24,
+                            ),
+                            child: AnimatedBuilder(
                                 animation: animations[index],
                                 builder: (context, val) {
-                            return Transform(
+                                  return Transform.scale(
-                              transform: Matrix4.identity()
+                                    alignment: Alignment.center,
-                                ..scale(animations[index].value,
+                                    scale: animations[index].value,
-                                    animations[index].value)
-                                ..rotateZ(1.0 - animations[index].value),
                                     child: StreamSvgIcon(
                                       assetName: reactionIcon.assetName,
-                                height: animations[index].value * 24.0,
+                                      height: max(
-                                width: animations[index].value * 24.0,
+                                        0,
+                                        animations[index].value * 24.0,
+                                      ),
+                                      width: max(
+                                        0,
+                                        animations[index].value * 24.0,
+                                      ),
                                       color: ownReactionIndex != -1
                                           ? StreamChatTheme.of(context)
                                               .colorTheme
@@ -114,8 +134,13 @@ class _ReactionPickerState extends State<ReactionPicker>
                                 );
                               }
                             },
+                          ),
                         );
-                  }).toList(),
+                      })
+                      .insertBetween(SizedBox(
+                        width: 16,
+                      ))
+                      .toList(),
                 ),
               ),
             ),

lib/src/stream_svg_icon.dart

@@ -889,4 +889,16 @@ class StreamSvgIcon extends StatelessWidget {
       height: size,
     );
   }
+
+  factory StreamSvgIcon.icon_flag({
+    double size,
+    Color color,
+  }) {
+    return StreamSvgIcon(
+      assetName: 'icon_flag.svg',
+      color: color,
+      width: size,
+      height: size,
+    );
+  }
 }

lib/src/utils.dart

@@ -1,4 +1,3 @@
-import 'package:emojis/emoji.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -38,27 +37,21 @@ Future<bool> showConfirmationDialog(
         return Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            SizedBox(
+            SizedBox(height: 26.0),
-              height: 26.0,
-            ),
             if (icon != null) icon,
-            SizedBox(
+            SizedBox(height: 26.0),
-              height: 26.0,
-            ),
             Text(
               title,
               style: StreamChatTheme.of(context).textTheme.headlineBold,
             ),
-            SizedBox(
+            SizedBox(height: 7.0),
-              height: 7.0,
+            Text(
-            ),
+              question,
-            Text(question),
+              textAlign: TextAlign.center,
-            SizedBox(
-              height: 36.0,
             ),
+            SizedBox(height: 36.0),
             Container(
-              color:
+              color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
-                  StreamChatTheme.of(context).colorTheme.black.withOpacity(.08),
               height: 1.0,
             ),
             Row(
@@ -67,22 +60,29 @@ Future<bool> showConfirmationDialog(
                 FlatButton(
                   child: Text(
                     cancelText,
-                    style: TextStyle(
+                    style: StreamChatTheme.of(context)
+                        .textTheme
+                        .bodyBold
+                        .copyWith(
                             color: StreamChatTheme.of(context)
                                 .colorTheme
                                 .black
-                            .withOpacity(0.5),
+                                .withOpacity(0.5)),
-                        fontWeight: FontWeight.w400),
                   ),
                   onPressed: () {
-                    Navigator.of(context).pop();
+                    Navigator.of(context).pop(false);
                   },
                 ),
                 FlatButton(
                   child: Text(
                     okText,
-                    style: TextStyle(
+                    style: StreamChatTheme.of(context)
-                        color: Colors.red, fontWeight: FontWeight.w400),
+                        .textTheme
+                        .bodyBold
+                        .copyWith(
+                            color: StreamChatTheme.of(context)
+                                .colorTheme
+                                .accentRed),
                   ),
                   onPressed: () {
                     Navigator.pop(context, true);
@@ -95,6 +95,77 @@ Future<bool> showConfirmationDialog(
       });
 }
 
+Future<bool> showInfoDialog(
+  BuildContext context, {
+  String title,
+  Widget icon,
+  String question,
+  String okText,
+  StreamChatThemeData theme,
+}) {
+  return showModalBottomSheet(
+    backgroundColor:
+        theme.colorTheme.white ?? StreamChatTheme.of(context).colorTheme.white,
+    context: context,
+    shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.only(
+      topLeft: Radius.circular(16.0),
+      topRight: Radius.circular(16.0),
+    )),
+    builder: (context) {
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SizedBox(
+            height: 26.0,
+          ),
+          if (icon != null) icon,
+          SizedBox(
+            height: 26.0,
+          ),
+          Text(
+            title,
+            style: theme.textTheme.headlineBold ??
+                StreamChatTheme.of(context).textTheme.headlineBold,
+          ),
+          SizedBox(
+            height: 7.0,
+          ),
+          Text(question),
+          SizedBox(
+            height: 36.0,
+          ),
+          Container(
+            color: theme.colorTheme.black.withOpacity(.08) ??
+                StreamChatTheme.of(context).colorTheme.black.withOpacity(.08),
+            height: 1.0,
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              FlatButton(
+                child: Text(
+                  okText,
+                  style: TextStyle(
+                      color: theme.colorTheme.black.withOpacity(0.5) ??
+                          StreamChatTheme.of(context)
+                              .colorTheme
+                              .black
+                              .withOpacity(0.5),
+                      fontWeight: FontWeight.w400),
+                ),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+            ],
+          ),
+        ],
+      );
+    },
+  );
+}
+
 /// Get random png with initials
 String getRandomPicUrl(User user) =>
     'https://getstream.io/random_png/?id=${user.id}&name=${user.name}';
@@ -215,16 +286,3 @@ StreamSvgIcon getFileTypeImage(String type) {
       break;
   }
 }
-
-final _emojis = Emoji.all();
-
-bool textIsOnlyEmoji(String text) {
-  return text.trim().characters.isNotEmpty &&
-      text.trim().characters.every((c) =>
-          _emojis.firstWhere(
-            (Emoji emoji) => emoji.char.contains(c),
-            orElse: () => null,
-          ) !=
-          null) &&
-      text.characters.length < 4;
-}

lib/svgs/icon_flag.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 2.5C4.44772 2.5 4 2.94772 4 3.5V4.5V14.5V21.5C4 22.0523 4.44772 22.5 5 22.5C5.55228 22.5 6 22.0523 6 21.5V14.5H20L18 9.5L20 4.5H6V3.5C6 2.94772 5.55228 2.5 5 2.5ZM6 6.5V12.5H17L16 9.5L17 6.5H6Z" fill="#7A7A7A"/>
+</svg>