From df155c5415dd5645fd526eeca998423019d92922 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 19 Jul 2021 16:32:50 +0200
Subject: [PATCH] align with latest stable

---
 packages/stream_chat_v1/lib/channel_page.dart | 44 ++++++++++---------
 .../stream_chat_v1/lib/chat_info_screen.dart  |  2 +-
 .../stream_chat_v1/lib/choose_user_page.dart  |  1 -
 packages/stream_chat_v1/lib/thread_page.dart  |  6 ++-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/packages/stream_chat_v1/lib/channel_page.dart b/packages/stream_chat_v1/lib/channel_page.dart
index 0bdb6b6..571a54d 100644
--- a/packages/stream_chat_v1/lib/channel_page.dart
+++ b/packages/stream_chat_v1/lib/channel_page.dart
@@ -113,31 +113,35 @@ class _ChannelPageState extends State<ChannelPage> {
                   initialAlignment: widget.initialAlignment,
                   highlightInitialMessage: widget.highlightInitialMessage,
                   onMessageSwiped: _reply,
-                  onReplyTap: _reply,
+                  messageBuilder: (context, details, messages, defaultMessage) {
+                    return defaultMessage.copyWith(
+                      onReplyTap: _reply,
+                      onShowMessage: (m, c) async {
+                        final client = StreamChat.of(context).client;
+                        final message = m;
+                        final channel = client.channel(
+                          c.type,
+                          id: c.id,
+                        );
+                        if (channel.state == null) {
+                          await channel.watch();
+                        }
+                        Navigator.pushReplacementNamed(
+                          context,
+                          Routes.CHANNEL_PAGE,
+                          arguments: ChannelPageArgs(
+                            channel: channel,
+                            initialMessage: message,
+                          ),
+                        );
+                      },
+                    );
+                  },
                   threadBuilder: (_, parentMessage) {
                     return ThreadPage(
                       parent: parentMessage,
                     );
                   },
-                  onShowMessage: (m, c) async {
-                    final client = StreamChat.of(context).client;
-                    final message = m;
-                    final channel = client.channel(
-                      c.type,
-                      id: c.id,
-                    );
-                    if (channel.state == null) {
-                      await channel.watch();
-                    }
-                    Navigator.pushReplacementNamed(
-                      context,
-                      Routes.CHANNEL_PAGE,
-                      arguments: ChannelPageArgs(
-                        channel: channel,
-                        initialMessage: message,
-                      ),
-                    );
-                  },
                   pinPermissions: ['owner', 'admin', 'member'],
                 ),
                 Positioned(
diff --git a/packages/stream_chat_v1/lib/chat_info_screen.dart b/packages/stream_chat_v1/lib/chat_info_screen.dart
index 013851b..6c6bb1e 100644
--- a/packages/stream_chat_v1/lib/chat_info_screen.dart
+++ b/packages/stream_chat_v1/lib/chat_info_screen.dart
@@ -635,7 +635,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
                 children: [
                   Padding(
                     padding: const EdgeInsets.all(8.0),
-                    child: ChannelImage(
+                    child: ChannelAvatar(
                       channel: channel,
                       constraints:
                           BoxConstraints(maxWidth: 40.0, maxHeight: 40.0),
diff --git a/packages/stream_chat_v1/lib/choose_user_page.dart b/packages/stream_chat_v1/lib/choose_user_page.dart
index f50ae55..e487acd 100644
--- a/packages/stream_chat_v1/lib/choose_user_page.dart
+++ b/packages/stream_chat_v1/lib/choose_user_page.dart
@@ -7,7 +7,6 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
-import 'main.dart';
 import 'routes/routes.dart';
 
 const kStreamApiKey = 'STREAM_API_KEY';
diff --git a/packages/stream_chat_v1/lib/thread_page.dart b/packages/stream_chat_v1/lib/thread_page.dart
index d1fbd3c..5d032f8 100644
--- a/packages/stream_chat_v1/lib/thread_page.dart
+++ b/packages/stream_chat_v1/lib/thread_page.dart
@@ -49,7 +49,11 @@ class _ThreadPageState extends State<ThreadPage> {
               initialScrollIndex: widget.initialScrollIndex,
               initialAlignment: widget.initialAlignment,
               onMessageSwiped: _reply,
-              onReplyTap: _reply,
+              messageBuilder: (context, details, messages, defaultMessage) {
+                return defaultMessage.copyWith(
+                  onReplyTap: _reply,
+                );
+              },
               pinPermissions: ['owner', 'admin', 'member'],
             ),
           ),