From 49dc157ea751150fc36518f6a537ca7f26c948f5 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Fri, 13 Nov 2020 17:12:36 +0100
Subject: [PATCH] fix attachment shape

---
 lib/src/message_input.dart  | 57 +++++++++++++++++++++----------------
 lib/src/message_widget.dart | 25 ++++++++++------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 1f157ed3..bac36ef7 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -218,7 +218,7 @@ class MessageInputState extends State<MessageInput> {
   Flex _buildTextField(BuildContext context) {
     return Flex(
       direction: Axis.horizontal,
-      crossAxisAlignment: CrossAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.end,
       children: <Widget>[
         if (!_commandEnabled) _buildExpandActionsButton(),
         if (widget.actionsLocation == ActionsLocation.left)
@@ -388,10 +388,7 @@ class MessageInputState extends State<MessageInput> {
                   autofocus: false,
                   textAlignVertical: TextAlignVertical.center,
                   decoration: InputDecoration(
-                    hintText:
-                        (_commandEnabled && _chosenCommand.name == 'giphy')
-                            ? 'Search GIFs'
-                            : 'Write a message',
+                    hintText: _getHint(),
                     prefixText: _commandEnabled ? null : '   ',
                     border: OutlineInputBorder(
                         borderSide: BorderSide(color: Colors.transparent)),
@@ -443,6 +440,16 @@ class MessageInputState extends State<MessageInput> {
     );
   }
 
+  String _getHint() {
+    if (_commandEnabled && _chosenCommand.name == 'giphy') {
+      return 'Search GIFs';
+    }
+    if (_attachments.isNotEmpty) {
+      return 'Add a command or send';
+    }
+    return 'Write a message';
+  }
+
   void _checkEmoji(String s, BuildContext context) {
     if (textEditingController.selection.isCollapsed &&
         (s.isNotEmpty && s[textEditingController.selection.start - 1] == ':' ||
@@ -551,8 +558,10 @@ class MessageInputState extends State<MessageInput> {
                           Padding(
                             padding:
                                 const EdgeInsets.symmetric(horizontal: 8.0),
-                            child: Icon(StreamIcons.lightning,
-                                color: StreamChatTheme.of(context).accentColor),
+                            child: Icon(
+                              StreamIcons.lightning,
+                              color: StreamChatTheme.of(context).accentColor,
+                            ),
                           ),
                           Text(
                             'Instant Commands',
@@ -1247,26 +1256,24 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Widget _buildCommandButton() {
-    return Center(
-      child: InkWell(
-        child: Padding(
-          padding: const EdgeInsets.only(
-              left: 4.0, right: 8.0, top: 8.0, bottom: 8.0),
-          child: Icon(
-            StreamIcons.lightning,
-            color: Color(0xFF000000).withAlpha(128),
-          ),
+    return InkWell(
+      child: Padding(
+        padding:
+            const EdgeInsets.only(left: 4.0, right: 8.0, top: 8.0, bottom: 8.0),
+        child: Icon(
+          StreamIcons.lightning,
+          color: Color(0xFF000000).withAlpha(128),
         ),
-        onTap: () {
-          if (_commandsOverlay == null) {
-            _commandsOverlay = _buildCommandsOverlayEntry();
-            Overlay.of(context).insert(_commandsOverlay);
-          } else {
-            _commandsOverlay?.remove();
-            _commandsOverlay = null;
-          }
-        },
       ),
+      onTap: () {
+        if (_commandsOverlay == null) {
+          _commandsOverlay = _buildCommandsOverlayEntry();
+          Overlay.of(context).insert(_commandsOverlay);
+        } else {
+          _commandsOverlay?.remove();
+          _commandsOverlay = null;
+        }
+      },
     );
   }
 
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index fd6286a2..ffe52634 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -585,14 +585,22 @@ class _MessageWidgetState extends State<MessageWidget> {
             widget.message,
             attachment,
           );
-          return wrapAttachmentWidget(context, attachmentWidget,
-              attachment: attachment);
+          return wrapAttachmentWidget(
+            context,
+            attachmentWidget,
+            attachment: attachment,
+          );
         })?.toList() ??
         [];
   }
 
-  Padding wrapAttachmentWidget(BuildContext context, Widget attachmentWidget,
-      {Attachment attachment}) {
+  Padding wrapAttachmentWidget(
+    BuildContext context,
+    Widget attachmentWidget, {
+    Attachment attachment,
+  }) {
+    final attachmentShape =
+        widget.attachmentShape ?? widget.shape ?? _getDefaultShape(context);
     return Padding(
       padding: EdgeInsets.only(
         bottom: 4,
@@ -605,13 +613,12 @@ class _MessageWidgetState extends State<MessageWidget> {
               ? Colors.white
               : _getBackgroundColor(),
           clipBehavior: Clip.hardEdge,
-          shape: widget.attachmentShape ??
-              widget.shape ??
-              _getDefaultShape(context),
+          shape: attachmentShape,
           child: Padding(
             padding: widget.attachmentPadding,
-            child: ClipRRect(
-              borderRadius: BorderRadius.circular(6),
+            child: Material(
+              clipBehavior: Clip.hardEdge,
+              shape: attachmentShape,
               child: Transform(
                 transform: Matrix4.rotationY(widget.reverse ? pi : 0),
                 alignment: Alignment.center,