From 7aafa89aae992c0e0ca9d50e4ca269548774d443 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Thu, 26 Aug 2021 10:01:02 +0200
Subject: [PATCH] fix(imessage): update imessage clone

---
 packages/imessage/android/build.gradle       | 2 +-
 packages/imessage/lib/main.dart              | 2 +-
 packages/imessage/lib/message_input.dart     | 2 +-
 packages/imessage/lib/message_list_view.dart | 2 +-
 packages/imessage/lib/message_page.dart      | 2 +-
 packages/imessage/pubspec.yaml               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/imessage/android/build.gradle b/packages/imessage/android/build.gradle
index c505a86..eec07a3 100644
--- a/packages/imessage/android/build.gradle
+++ b/packages/imessage/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         jcenter()
diff --git a/packages/imessage/lib/main.dart b/packages/imessage/lib/main.dart
index fc7283d..ec5a59a 100644
--- a/packages/imessage/lib/main.dart
+++ b/packages/imessage/lib/main.dart
@@ -48,7 +48,7 @@ class ChatLoader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final user = StreamChatCore.of(context).user!;
+    final user = StreamChatCore.of(context).currentUser!;
     return CupertinoPageScaffold(
       child: ChannelsBloc(
         child: ChannelListCore(
diff --git a/packages/imessage/lib/message_input.dart b/packages/imessage/lib/message_input.dart
index 7836498..0e47240 100644
--- a/packages/imessage/lib/message_input.dart
+++ b/packages/imessage/lib/message_input.dart
@@ -38,7 +38,7 @@ class _MessageInputState extends State<MessageInput> {
             GestureDetector(
               onTap: () async {
                 final pickedFile =
-                    await (picker.getImage(source: ImageSource.gallery));
+                    await (picker.pickImage(source: ImageSource.gallery));
                 if (pickedFile == null) {
                   return;
                 }
diff --git a/packages/imessage/lib/message_list_view.dart b/packages/imessage/lib/message_list_view.dart
index b76f506..9efa5b5 100644
--- a/packages/imessage/lib/message_list_view.dart
+++ b/packages/imessage/lib/message_list_view.dart
@@ -64,7 +64,7 @@ class MessageListView extends StatelessWidget {
   }
 
   bool isReceived(Message message, BuildContext context) {
-    final currentUserId = StreamChatCore.of(context).user!.id;
+    final currentUserId = StreamChatCore.of(context).currentUser!.id;
     return message.user!.id == currentUserId;
   }
 
diff --git a/packages/imessage/lib/message_page.dart b/packages/imessage/lib/message_page.dart
index f64eb66..08a20e0 100644
--- a/packages/imessage/lib/message_page.dart
+++ b/packages/imessage/lib/message_page.dart
@@ -41,7 +41,7 @@ class MessagePage extends StatelessWidget {
                   child: CupertinoActivityIndicator(),
                 );
               },
-              errorWidgetBuilder: (context, err) {
+              errorBuilder: (context, err) {
                 return Center(
                   child: Text('Error'),
                 );
diff --git a/packages/imessage/pubspec.yaml b/packages/imessage/pubspec.yaml
index 9d05f4c..4af86c3 100644
--- a/packages/imessage/pubspec.yaml
+++ b/packages/imessage/pubspec.yaml
@@ -24,7 +24,7 @@ dependencies:
   flutter:
     sdk: flutter
   intl: ^0.17.0
-  stream_chat_flutter: ^2.0.0-nullsafety.3
+  stream_chat_flutter: ^2.2.0
   animations: ^2.0.0
   collection: ^1.15.0
   cached_network_image: ^3.0.0