From 9658100e91b3c03e070e76ea7c915e6f3218ec21 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Wed, 18 Aug 2021 11:01:34 +0200
Subject: [PATCH] fix user avatar constraints

---
 .../lib/channel_media_display_screen.dart     |  2 +-
 .../stream_chat_v1/lib/chat_info_screen.dart  |  8 +++----
 .../stream_chat_v1/lib/group_info_screen.dart | 21 ++++++++++++-------
 .../lib/pinned_messages_screen.dart           |  8 +++----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/packages/stream_chat_v1/lib/channel_media_display_screen.dart b/packages/stream_chat_v1/lib/channel_media_display_screen.dart
index f2ad261..b65df62 100644
--- a/packages/stream_chat_v1/lib/channel_media_display_screen.dart
+++ b/packages/stream_chat_v1/lib/channel_media_display_screen.dart
@@ -20,7 +20,7 @@ class ChannelMediaDisplayScreen extends StatefulWidget {
 
   final ShowMessageCallback? onShowMessage;
 
-  final MessageTheme messageTheme;
+  final MessageThemeData messageTheme;
 
   const ChannelMediaDisplayScreen({
     required this.messageTheme,
diff --git a/packages/stream_chat_v1/lib/chat_info_screen.dart b/packages/stream_chat_v1/lib/chat_info_screen.dart
index 0f7a8a9..1ac7156 100644
--- a/packages/stream_chat_v1/lib/chat_info_screen.dart
+++ b/packages/stream_chat_v1/lib/chat_info_screen.dart
@@ -15,7 +15,7 @@ class ChatInfoScreen extends StatefulWidget {
   /// User in consideration
   final User? user;
 
-  final MessageTheme messageTheme;
+  final MessageThemeData messageTheme;
 
   const ChatInfoScreen({
     Key? key,
@@ -79,9 +79,9 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
                   padding: const EdgeInsets.all(16.0),
                   child: UserAvatar(
                     user: widget.user!,
-                    constraints: BoxConstraints(
-                      maxWidth: 72.0,
-                      maxHeight: 72.0,
+                    constraints: BoxConstraints.tightFor(
+                      width: 72.0,
+                      height: 72.0,
                     ),
                     borderRadius: BorderRadius.circular(36.0),
                     showOnlineStatus: false,
diff --git a/packages/stream_chat_v1/lib/group_info_screen.dart b/packages/stream_chat_v1/lib/group_info_screen.dart
index c6d3969..8564afe 100644
--- a/packages/stream_chat_v1/lib/group_info_screen.dart
+++ b/packages/stream_chat_v1/lib/group_info_screen.dart
@@ -16,7 +16,7 @@ import 'pinned_messages_screen.dart';
 import 'routes/routes.dart';
 
 class GroupInfoScreen extends StatefulWidget {
-  final MessageTheme messageTheme;
+  final MessageThemeData messageTheme;
 
   const GroupInfoScreen({
     Key? key,
@@ -223,11 +223,15 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
                         children: [
                           Padding(
                             padding: const EdgeInsets.symmetric(
-                                horizontal: 8.0, vertical: 12.0),
+                              horizontal: 8.0,
+                              vertical: 12.0,
+                            ),
                             child: UserAvatar(
                               user: member.user!,
-                              constraints: BoxConstraints(
-                                  maxHeight: 40.0, maxWidth: 40.0),
+                              constraints: BoxConstraints.tightFor(
+                                height: 40.0,
+                                width: 40.0,
+                              ),
                             ),
                           ),
                           Expanded(
@@ -684,7 +688,8 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
               );
               if (res == true) {
                 final channel = StreamChannel.of(context).channel;
-                await channel.removeMembers([StreamChat.of(context).currentUser!.id]);
+                await channel
+                    .removeMembers([StreamChat.of(context).currentUser!.id]);
                 Navigator.pop(context);
               }
             },
@@ -894,9 +899,9 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
                       padding: const EdgeInsets.all(16.0),
                       child: UserAvatar(
                         user: user,
-                        constraints: BoxConstraints(
-                          maxHeight: 64.0,
-                          minHeight: 64.0,
+                        constraints: BoxConstraints.tightFor(
+                          height: 64.0,
+                          width: 64.0,
                         ),
                         borderRadius: BorderRadius.circular(32.0),
                       ),
diff --git a/packages/stream_chat_v1/lib/pinned_messages_screen.dart b/packages/stream_chat_v1/lib/pinned_messages_screen.dart
index 11287bb..f88270a 100644
--- a/packages/stream_chat_v1/lib/pinned_messages_screen.dart
+++ b/packages/stream_chat_v1/lib/pinned_messages_screen.dart
@@ -20,7 +20,7 @@ class PinnedMessagesScreen extends StatefulWidget {
 
   final ShowMessageCallback? onShowMessage;
 
-  final MessageTheme messageTheme;
+  final MessageThemeData messageTheme;
 
   const PinnedMessagesScreen({
     required this.messageTheme,
@@ -168,9 +168,9 @@ class _PinnedMessagesScreenState extends State<PinnedMessagesScreen> {
               return ListTile(
                 leading: UserAvatar(
                   user: user,
-                  constraints: BoxConstraints(
-                    maxWidth: 40.0,
-                    minHeight: 40.0,
+                  constraints: BoxConstraints.tightFor(
+                    width: 40.0,
+                    height: 40.0,
                   ),
                   borderRadius: BorderRadius.circular(28),
                 ),