Merge pull request GetStream#53 from GetStream/chore/update-samples

chore: update dependencies and readme

Author: imtoori

README.md

@@ -25,16 +25,18 @@ With Stream's chat components, developers quickly add chat to their app for a va
 ## Repo Overview 😎
 
 This repo contains projects and samples developed by the team and Stream community. Projects are broke up into directories under the `packages` folder.
-Each project contains a README with build and execution instructions. 
 
-## **Projects 🚀**
+Each project contains a README with build and execution instructions. 
 
+## **Maintained Projects 🚀**
 - [Stream Chat v1](https://github.com/GetStream/flutter-samples/tree/main/packages/stream_chat_v1): a sample app implemented using Stream Chat and Flutter. It is a fully fledged messaging app built using a combination of our pre-made widgets and custom Flutter widgets.
+- [Chatter YouTube Series](https://github.com/HayesGordon/chatter): an ongoing, beginner friendly, YouTube video series showing how to use Stream's Flutter packages.
+- [iMessage clone](https://github.com/GetStream/flutter-samples/tree/main/packages/imessage): an iMessage clone implemented using Flutter and the `stream_chat_flutter_core` package.
 
+## **Historic Projects 📕**
+*These projects are not actively maintained. They were developed using older versions of our packages and Flutter.*
 - [Stream Chatty](https://github.com/GetStream/flutter-samples/tree/main/packages/chatty) Stream Chatty is a sample chat app made in Flutter using Stream Chat, Firebase, and flutter_bloc. It has full light and dark mode support, real-time chat, and full authentication using Firebase auth.
 
-- [iMessage clone](https://github.com/GetStream/flutter-samples/tree/main/packages/imessage): an iMessage clone implemented using Flutter and the `stream_chat_flutter_core` package.
-
 ## Requirements 🛠
 
 Before running this project please ensure Flutter is installed and configured on your machine. If you're new to Flutter, please checkout the [official guide](https://flutter.dev/docs/get-started/install) with installation instructions for your OS. 

packages/chatty/README.md

@@ -1,5 +1,9 @@
 # Stream Chatty
 
+⚠️ **Attention**: This example is no longer maintained. It uses older versions of our packages and was tested on an older version of Flutter.
+
+---
+
 Stream Chatty is a sample chat app made in Flutter using [Stream Chat](https://getstream.io/chat/sdk/flutter/), [Firebase](https://firebase.google.com/), and [flutter_bloc](https://bloclibrary.dev/#/). It has full light and dark mode support, real-time chat, and full authentication using Firebase auth. 
 
 Stream Chatty was created by [Diego Velasquez](http://www.twitter.com/diegoveloper) as part of a Youtube series. A step by step guide to building Stream Chatty from scratch can be found here:

packages/chatty/lib/data/local/image_picker_impl.dart

@@ -6,7 +6,7 @@ class ImagePickerImpl extends ImagePickerRepository {
   @override
   Future<File?> pickImage() async {
     final picker = ImagePicker();
-    final pickedFile = await picker.getImage(
+    final pickedFile = await picker.pickImage(
       source: ImageSource.gallery,
       maxWidth: 400,
     );

packages/chatty/lib/data/local/stream_api_local_impl.dart

@@ -8,15 +8,15 @@ class StreamApiLocalImpl extends StreamApiRepository {
   final StreamChatClient _client;
 
   @override
-  Future<ChatUser> connectUser(ChatUser user, String? token) async {
+  Future<ChatUser> connectUser(ChatUser user, String token) async {
     Map<String, dynamic> extraData = {};
     if (user.image != null) {
       extraData['image'] = user.image;
     }
     if (user.name != null) {
       extraData['name'] = user.name;
     }
-    await _client.disconnect();
+    await _client.disconnectUser();
     await _client.connectUser(
       User(id: user.id!, extraData: extraData as Map<String, Object>),
       token,
@@ -28,7 +28,7 @@ class StreamApiLocalImpl extends StreamApiRepository {
   Future<List<ChatUser>> getChatUsers() async {
     final result = await _client.queryUsers();
     final chatUsers = result.users
-        .where((element) => element.id != _client.state.user!.id)
+        .where((element) => element.id != _client.state.currentUser!.id)
         .map(
           (e) => ChatUser(
             id: e.id,
@@ -42,7 +42,7 @@ class StreamApiLocalImpl extends StreamApiRepository {
 
   @override
   Future<String> getToken(String userId) async {
-    return _client.devToken(userId);
+    return _client.devToken(userId).rawValue;
   }
 
   @override
@@ -52,7 +52,7 @@ class StreamApiLocalImpl extends StreamApiRepository {
     final channel = _client.channel('messaging', id: channelId, extraData: {
       'name': name!,
       'image': image!,
-      'members': [_client.state.user!.id, ...members!],
+      'members': [_client.state.currentUser!.id, ...members!],
     });
     await channel.watch();
     return channel;
@@ -61,11 +61,11 @@ class StreamApiLocalImpl extends StreamApiRepository {
   @override
   Future<Channel> createSimpleChat(String? friendId) async {
     final channel = _client.channel('messaging',
-        id: '${_client.state.user!.id.hashCode}${friendId.hashCode}',
+        id: '${_client.state.currentUser!.id.hashCode}${friendId.hashCode}',
         extraData: {
           'members': [
             friendId,
-            _client.state.user!.id,
+            _client.state.currentUser!.id,
           ],
         });
     await channel.watch();
@@ -74,7 +74,7 @@ class StreamApiLocalImpl extends StreamApiRepository {
 
   @override
   Future<void> logout() {
-    return _client.disconnect();
+    return _client.disconnectUser();
   }
 
   @override
@@ -84,6 +84,6 @@ class StreamApiLocalImpl extends StreamApiRepository {
       User(id: userId),
       token,
     );
-    return _client.state.user!.name != userId;
+    return _client.state.currentUser!.name != userId;
   }
 }

packages/chatty/lib/data/prod/stream_api_impl.dart

@@ -11,15 +11,15 @@ class StreamApiImpl extends StreamApiRepository {
   final StreamChatClient _client;
 
   @override
-  Future<ChatUser> connectUser(ChatUser user, String? token) async {
+  Future<ChatUser> connectUser(ChatUser user, String token) async {
     Map<String, dynamic> extraData = {};
     if (user.image != null) {
       extraData['image'] = user.image;
     }
     if (user.name != null) {
       extraData['name'] = user.name;
     }
-    await _client.disconnect();
+    await _client.disconnectUser();
     await _client.connectUser(
       User(id: user.id!, extraData: extraData as Map<String, Object>),
       token,
@@ -31,7 +31,7 @@ class StreamApiImpl extends StreamApiRepository {
   Future<List<ChatUser>> getChatUsers() async {
     final result = await _client.queryUsers();
     final chatUsers = result.users
-        .where((element) => element.id != _client.state.user!.id)
+        .where((element) => element.id != _client.state.currentUser!.id)
         .map(
           (e) => ChatUser(
             id: e.id,
@@ -44,7 +44,7 @@ class StreamApiImpl extends StreamApiRepository {
   }
 
   @override
-  Future<String?> getToken(String userId) async {
+  Future<String> getToken(String userId) async {
     //TODO: use your own implementation in Production
     final response = await http.post(
       Uri.parse('your_backend_url'),
@@ -62,12 +62,13 @@ class StreamApiImpl extends StreamApiRepository {
   }
 
   @override
-  Future<Channel> createGroupChat(String id, String? name, List<String?>? members,
+  Future<Channel> createGroupChat(
+      String id, String? name, List<String?>? members,
       {String? image}) async {
     final channel = _client.channel('messaging', id: id, extraData: {
       'name': name!,
       'image': image!,
-      'members': [_client.state.user!.id, ...members!],
+      'members': [_client.state.currentUser!.id, ...members!],
     });
     await channel.watch();
     return channel;
@@ -76,11 +77,11 @@ class StreamApiImpl extends StreamApiRepository {
   @override
   Future<Channel> createSimpleChat(String? friendId) async {
     final channel = _client.channel('messaging',
-        id: '${_client.state.user!.id.hashCode}${friendId.hashCode}',
+        id: '${_client.state.currentUser!.id.hashCode}${friendId.hashCode}',
         extraData: {
           'members': [
             friendId,
-            _client.state.user!.id,
+            _client.state.currentUser!.id,
           ],
         });
     await channel.watch();
@@ -89,7 +90,7 @@ class StreamApiImpl extends StreamApiRepository {
 
   @override
   Future<void> logout() async {
-    return _client.disconnect();
+    return _client.disconnectUser();
   }
 
   @override
@@ -99,6 +100,6 @@ class StreamApiImpl extends StreamApiRepository {
       User(id: userId),
       token,
     );
-    return _client.state.user!.name != userId;
+    return _client.state.currentUser!.name != userId;
   }
 }

packages/chatty/lib/data/stream_api_repository.dart

@@ -3,12 +3,21 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 abstract class StreamApiRepository {
   Future<List<ChatUser>> getChatUsers();
-  Future<String?> getToken(String userId);
+
+  Future<String> getToken(String userId);
+
   Future<bool> connectIfExist(String userId);
-  Future<ChatUser> connectUser(ChatUser user, String? token);
+
+  Future<ChatUser> connectUser(ChatUser user, String token);
+
   Future<Channel> createGroupChat(
-      String channelId, String? name, List<String?>? members,
-      {String? image});
+    String channelId,
+    String? name,
+    List<String?>? members, {
+    String? image,
+  });
+
   Future<Channel> createSimpleChat(String? friendId);
+
   Future<void> logout();
 }

packages/chatty/lib/domain/usecases/profile_sign_in_usecase.dart

@@ -9,6 +9,7 @@ import '../exceptions/auth_exception.dart';
 
 class ProfileInput {
   ProfileInput({this.imageFile, this.name});
+
   final File? imageFile;
   final String? name;
 }
@@ -36,11 +37,12 @@ class ProfileSignInUseCase {
           input.imageFile, 'users/${auth.id}');
     }
     await _streamApiRepository.connectUser(
-        ChatUser(
-          name: input.name,
-          id: auth.id,
-          image: image,
-        ),
-        token);
+      ChatUser(
+        name: input.name,
+        id: auth.id,
+        image: image,
+      ),
+      token,
+    );
   }
 }

packages/chatty/lib/main.dart

@@ -19,7 +19,10 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.bottom]);
+    SystemChrome.setEnabledSystemUIMode(
+      SystemUiMode.manual,
+      overlays: [SystemUiOverlay.bottom],
+    );
 
     return MultiRepositoryProvider(
       providers: buildRepositories(_streamChatClient),
@@ -36,9 +39,10 @@ class MyApp extends StatelessWidget {
                 client: _streamChatClient,
                 streamChatThemeData:
                     StreamChatThemeData.fromTheme(Theme.of(context)).copyWith(
-                  ownMessageTheme: MessageTheme(
-                    messageBackgroundColor: Theme.of(context).accentColor,
-                    messageText: TextStyle(color: Colors.white),
+                  ownMessageTheme: MessageThemeData(
+                    messageBackgroundColor:
+                        Theme.of(context).colorScheme.secondary,
+                    messageTextStyle: TextStyle(color: Colors.white),
                   ),
                 ),
               );