Merge pull request #129 from GetStream/feature/choose-user

Feature/choose user

lib/src/channel_list_view.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
@@ -482,6 +483,8 @@ class _ChannelListViewState extends State<ChannelListView>
     }
   }
 
+  StreamSubscription _subscription;
+
   @override
   void initState() {
     super.initState();
@@ -506,7 +509,7 @@ class _ChannelListViewState extends State<ChannelListView>
 
     final client = StreamChat.of(context).client;
 
-    client
+    _subscription = client
         .on(
       EventType.connectionRecovered,
       EventType.notificationAddedToChannel,
@@ -544,6 +547,7 @@ class _ChannelListViewState extends State<ChannelListView>
 
   @override
   void dispose() {
+    _subscription.cancel();
     WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }

lib/src/channel_preview.dart

@@ -70,11 +70,20 @@ class ChannelPreview extends StatelessWidget {
                           StreamChatTheme.of(context).channelPreviewTheme.title,
                     ),
                   ),
-                  if (channel.state.members.contains(
-                      (Member e) => e.userId == channel.client.state.user.id))
-                    UnreadIndicator(
-                      channel: channel,
-                    ),
+                  StreamBuilder<List<Member>>(
+                      stream: channel.state.membersStream,
+                      initialData: channel.state.members,
+                      builder: (context, snapshot) {
+                        if (!snapshot.hasData ||
+                            snapshot.data.isEmpty ||
+                            !snapshot.data.any((Member e) =>
+                                e.user.id == channel.client.state.user.id)) {
+                          return SizedBox();
+                        }
+                        return UnreadIndicator(
+                          channel: channel,
+                        );
+                      }),
                 ],
               ),
               subtitle: Row(

lib/src/sending_indicator.dart

@@ -18,6 +18,7 @@ class SendingIndicator extends StatelessWidget {
       return Icon(
         Icons.done_all,
         size: 8,
+        color: StreamChatTheme.of(context).accentColor,
       );
     }
     if (message.status == MessageSendingStatus.SENT || message.status == null) {

lib/src/stream_chat_theme.dart

@@ -1,3 +1,4 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_flutter/src/channel_header.dart';
@@ -5,6 +6,7 @@ import 'package:stream_chat_flutter/src/channel_preview.dart';
 import 'package:stream_chat_flutter/src/message_input.dart';
 import 'package:stream_chat_flutter/src/reaction_icon.dart';
 import 'package:stream_chat_flutter/src/stream_icons.dart';
+import 'package:stream_chat_flutter/src/utils.dart';
 
 /// Inherited widget providing the [StreamChatThemeData] to the widget tree
 class StreamChatTheme extends InheritedWidget {
@@ -218,6 +220,7 @@ class StreamChatThemeData {
     final accentColor = Color(0xff006cff);
     final isDark = theme.brightness == Brightness.dark;
     return StreamChatThemeData(
+      secondaryColor: Color(0xffEAEAEA),
       accentColor: accentColor,
       primaryColor: isDark ? Colors.black : Colors.white,
       primaryIconTheme: IconThemeData(
@@ -225,9 +228,9 @@ class StreamChatThemeData {
       defaultChannelImage: (context, channel) => SizedBox(),
       backgroundColor: isDark ? Colors.black : Colors.white,
       defaultUserImage: (context, user) => Center(
-        child: Text(
-          user.name?.substring(0, 1) ?? '',
-          style: TextStyle(color: Colors.white),
+        child: CachedNetworkImage(
+          imageUrl: getRandomPicUrl(user),
+          fit: BoxFit.cover,
         ),
       ),
       channelPreviewTheme: ChannelPreviewTheme(

lib/src/user_avatar.dart

@@ -27,6 +27,7 @@ class UserAvatar extends StatelessWidget {
     final hasImage = user.extraData?.containsKey('image') == true &&
         user.extraData['image'] != null &&
         user.extraData['image'] != '';
+    final streamChatTheme = StreamChatTheme.of(context);
     return GestureDetector(
       onTap: onTap != null
           ? () {
@@ -39,38 +40,22 @@ class UserAvatar extends StatelessWidget {
         children: <Widget>[
           ClipRRect(
             borderRadius: borderRadius ??
-                StreamChatTheme.of(context)
-                    .ownMessageTheme
-                    .avatarTheme
-                    .borderRadius,
+                streamChatTheme.ownMessageTheme.avatarTheme.borderRadius,
             child: Container(
               constraints: constraints ??
-                  StreamChatTheme.of(context)
-                      .ownMessageTheme
-                      .avatarTheme
-                      .constraints,
+                  streamChatTheme.ownMessageTheme.avatarTheme.constraints,
               decoration: BoxDecoration(
-                color: StreamChatTheme.of(context).accentColor,
+                color: streamChatTheme.accentColor,
               ),
               child: hasImage
                   ? CachedNetworkImage(
                       imageUrl: user.extraData['image'],
                       errorWidget: (_, __, ___) {
-                        return Center(
-                          child: Text(
-                            user.extraData?.containsKey('name') ?? false
-                                ? user.extraData['name'][0]
-                                : '',
-                            style: TextStyle(
-                              color: Colors.white,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        );
+                        return streamChatTheme.defaultUserImage(context, user);
                       },
                       fit: BoxFit.cover,
                     )
-                  : StreamChatTheme.of(context).defaultUserImage(context, user),
+                  : streamChatTheme.defaultUserImage(context, user),
             ),
           ),
           if (showOnlineStatus && user.online == true)

lib/src/utils.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:stream_chat/stream_chat.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 Future<void> launchURL(BuildContext context, String url) async {
@@ -42,3 +43,7 @@ Future<bool> showConfirmationDialog(
     },
   );
 }
+
+/// Get random png with initials
+String getRandomPicUrl(User user) =>
+    'https://getstream.io/random_png/?id=${user.id}&name=${user.name}';