Merge branch 'master' into feature/new-ui

example/lib/customize_channel_preview.dart

@@ -59,7 +59,7 @@ class ChannelListPage extends StatelessWidget {
           filter: {
             'members': {
               '\$in': [StreamChat.of(context).user.id],
-            },
+            }
           },
           channelPreviewBuilder: _channelPreviewBuilder,
           sort: [SortOption('last_message_at')],
@@ -73,17 +73,18 @@ class ChannelListPage extends StatelessWidget {
   }
 
   Widget _channelPreviewBuilder(BuildContext context, Channel channel) {
-    final lastMessage = channel.state.messages.reversed.firstWhere(
-      (message) => message.type != 'deleted',
-      orElse: () => null,
-    );
+    final lastMessage = channel.state.messages.reversed
+        .firstWhere((message) => !message.isDeleted);
 
-    final subtitle = (lastMessage == null ? 'nothing yet' : lastMessage.text);
+    final subtitle = (lastMessage == null ? "nothing yet" : lastMessage.text);
     final opacity = channel.state.unreadCount > .0 ? 1.0 : 0.5;
 
     return ListTile(
-      leading: ChannelImage(),
+      leading: ChannelImage(
+        channel: channel,
+      ),
       title: ChannelName(
+        channel: channel,
         textStyle:
             StreamChatTheme.of(context).channelPreviewTheme.title.copyWith(
                   color: Colors.black.withOpacity(opacity),

example/lib/customize_message_widget.dart

@@ -98,6 +98,9 @@ class ChannelPage extends StatelessWidget {
   ) {
     final message = details.message;
     final color = details.isMyMessage ? Colors.blueGrey : Colors.blue;
+    if (message.isSystem) {
+      return SizedBox();
+    }
     return MessageWidget(
       message: message,
       messageTheme: details.isMyMessage

example/lib/multiple_conversation.dart

@@ -44,9 +44,7 @@ class MyApp extends StatelessWidget {
         client: client,
         child: child,
       ),
-      home: Container(
-        child: ChannelListPage(),
-      ),
+      home: ChannelListPage(),
     );
   }
 }