Merge branch 'master' into feature/notifications

# Conflicts:
#	CHANGELOG.md
#	README.md
#	pubspec.yaml

lib/src/message_input.dart

@@ -280,15 +280,12 @@ class _MessageInputState extends State<MessageInput> {
               ],
               color: StreamChatTheme.of(context).primaryColor,
             ),
-            child: Flex(
+            child: ListView(
-              mainAxisSize: MainAxisSize.min,
-              direction: Axis.vertical,
-              children: <Widget>[
-                ListView(
               padding: const EdgeInsets.all(0),
               shrinkWrap: true,
               children: commands
-                      .map((c) => ListTile(
+                  .map(
+                    (c) => ListTile(
                       title: Text.rich(
                         TextSpan(
                           text: '${c.name}',
@@ -307,10 +304,9 @@ class _MessageInputState extends State<MessageInput> {
                       onTap: () {
                         _setCommand(c);
                       },
-                          ))
-                      .toList(),
                     ),
-              ],
+                  )
+                  .toList(),
             ),
           ),
         ),
@@ -351,11 +347,7 @@ class _MessageInputState extends State<MessageInput> {
               ],
               color: StreamChatTheme.of(context).primaryColor,
             ),
-            child: Flex(
+            child: ListView(
-              mainAxisSize: MainAxisSize.min,
-              direction: Axis.vertical,
-              children: <Widget>[
-                ListView(
               padding: const EdgeInsets.all(0),
               shrinkWrap: true,
               children: members
@@ -372,8 +364,8 @@ class _MessageInputState extends State<MessageInput> {
 
                           _textController.value = TextEditingValue(
                             text: rejoin +
-                                    _textController.text.substring(
+                                _textController.text
-                                        _textController.selection.start),
+                                    .substring(_textController.selection.start),
                             selection: TextSelection.collapsed(
                               offset: rejoin.length,
                             ),
@@ -385,8 +377,6 @@ class _MessageInputState extends State<MessageInput> {
                       ))
                   .toList(),
             ),
-              ],
-            ),
           ),
         ),
       );

lib/src/message_widget.dart

@@ -1023,6 +1023,22 @@ class _MessageWidgetState extends State<MessageWidget>
     );
   }
 
+  Widget _buildErrorImage(Attachment attachment) {
+    return Center(
+      child: Container(
+        width: 200,
+        height: 140,
+        color: Color(0xffd0021B).withOpacity(.1),
+        child: Center(
+          child: Icon(
+            Icons.error_outline,
+            color: Colors.white,
+          ),
+        ),
+      ),
+    );
+  }
+
   Widget _buildVideo(
     Attachment attachment,
   ) {