Merge remote-tracking branch 'origin/develop' into fix/channel-image

# Conflicts:
#	packages/stream_chat_flutter/test/src/channel_image_test.dart

packages/stream_chat_flutter/test/src/deleted_message_test.dart

@@ -70,6 +70,7 @@ void main() {
           StreamChat(
             streamChatThemeData: theme,
             client: client,
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
             child: StreamChannel(
               showLoading: false,
               channel: channel,
@@ -79,7 +80,6 @@ void main() {
                 ),
               ),
             ),
-            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
@@ -123,6 +123,7 @@ void main() {
           StreamChat(
             streamChatThemeData: theme,
             client: client,
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
             child: StreamChannel(
               showLoading: false,
               channel: channel,
@@ -132,7 +133,6 @@ void main() {
                 ),
               ),
             ),
-            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
@@ -176,6 +176,7 @@ void main() {
           StreamChat(
             streamChatThemeData: theme,
             client: client,
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
             child: StreamChannel(
               showLoading: false,
               channel: channel,
@@ -189,7 +190,6 @@ void main() {
                 ),
               ),
             ),
-            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),

packages/stream_chat_flutter/test/src/full_screen_media_test.dart

@@ -54,12 +54,12 @@ void main() {
             )
           ]));
       when(() => channelState.typingEvents).thenAnswer((i) => {
-            User(id: 'other-user', extraData: {'name': 'demo'}):
+            User(id: 'other-user', extraData: const {'name': 'demo'}):
                 Event(type: EventType.typingStart),
           });
       when(() => channelState.typingEventsStream)
           .thenAnswer((i) => Stream.value({
-                User(id: 'other-user', extraData: {'name': 'demo'}):
+                User(id: 'other-user', extraData: const {'name': 'demo'}):
                     Event(type: EventType.typingStart),
               }));
 

packages/stream_chat_flutter/test/src/gallery_footer_theme_test.dart

@@ -14,7 +14,7 @@ void main() {
   });
 
   test(
-      'Light GalleryFooterThemeData lerps completely to dark GalleryFooterThemeData',
+      '''Light GalleryFooterThemeData lerps completely to dark GalleryFooterThemeData''',
       () {
     expect(
         const GalleryFooterThemeData().lerp(_galleryFooterThemeDataControl,
@@ -23,7 +23,7 @@ void main() {
   });
 
   test(
-      'Light GalleryFooterThemeData lerps halfway to dark GalleryFooterThemeData',
+      '''Light GalleryFooterThemeData lerps halfway to dark GalleryFooterThemeData''',
       () {
     expect(
         const GalleryFooterThemeData().lerp(_galleryFooterThemeDataControl,
@@ -32,7 +32,7 @@ void main() {
   });
 
   test(
-      'Dark GalleryFooterThemeData lerps completely to light GalleryFooterThemeData',
+      '''Dark GalleryFooterThemeData lerps completely to light GalleryFooterThemeData''',
       () {
     expect(
         const GalleryFooterThemeData().lerp(_galleryFooterThemeDataControlDark,

packages/stream_chat_flutter/test/src/gallery_header_theme_test.dart

@@ -14,7 +14,7 @@ void main() {
   });
 
   test(
-      'Light GalleryHeaderThemeData lerps completely to dark GalleryHeaderThemeData',
+      '''Light GalleryHeaderThemeData lerps completely to dark GalleryHeaderThemeData''',
       () {
     expect(
         const GalleryHeaderThemeData().lerp(_galleryHeaderThemeDataControl,
@@ -23,7 +23,7 @@ void main() {
   });
 
   test(
-      'Light GalleryHeaderThemeData lerps halfway to dark GalleryHeaderThemeData',
+      '''Light GalleryHeaderThemeData lerps halfway to dark GalleryHeaderThemeData''',
       () {
     expect(
         const GalleryHeaderThemeData().lerp(_galleryHeaderThemeDataControl,
@@ -32,7 +32,7 @@ void main() {
   });
 
   test(
-      'Dark GalleryHeaderThemeData lerps completely to light GalleryHeaderThemeData',
+      '''Dark GalleryHeaderThemeData lerps completely to light GalleryHeaderThemeData''',
       () {
     expect(
         const GalleryHeaderThemeData().lerp(_galleryHeaderThemeDataDarkControl,

packages/stream_chat_flutter/test/src/message_text_test.dart

@@ -79,7 +79,8 @@ void main() {
         'name': 'test',
       });
 
-      final messageText = '''a message.
+      const messageText = '''
+      a message.
 with multiple lines
 and a list:
 - a. okasd

packages/stream_chat_flutter/test/src/reaction_bubble_test.dart

@@ -47,6 +47,7 @@ void main() {
         StreamChat(
           client: client,
           streamChatThemeData: theme,
+          connectivityStream: Stream.value(ConnectivityResult.mobile),
           child: SizedBox(
             child: ReactionBubble(
               reactions: [
@@ -60,7 +61,6 @@ void main() {
               maskColor: theme.ownMessageTheme.reactionsMaskColor!,
             ),
           ),
-          connectivityStream: Stream.value(ConnectivityResult.mobile),
         ),
         surfaceSize: const Size(100, 100),
       );
@@ -83,6 +83,7 @@ void main() {
         StreamChat(
           client: client,
           streamChatThemeData: StreamChatThemeData.fromTheme(themeData),
+          connectivityStream: Stream.value(ConnectivityResult.mobile),
           child: Container(
             color: Colors.black,
             child: ReactionBubble(
@@ -97,7 +98,6 @@ void main() {
               maskColor: theme.ownMessageTheme.reactionsMaskColor!,
             ),
           ),
-          connectivityStream: Stream.value(ConnectivityResult.mobile),
         ),
         surfaceSize: const Size(100, 100),
       );

packages/stream_chat_flutter/test/src/system_message_test.dart

@@ -89,6 +89,7 @@ void main() {
         )(
           StreamChat(
             client: client,
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
             child: StreamChannel(
               showLoading: false,
               channel: channel,
@@ -100,7 +101,6 @@ void main() {
                 ),
               ),
             ),
-            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
@@ -141,6 +141,7 @@ void main() {
         )(
           StreamChat(
             client: client,
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
             child: StreamChannel(
               showLoading: false,
               channel: channel,
@@ -152,7 +153,6 @@ void main() {
                 ),
               ),
             ),
-            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),

packages/stream_chat_flutter/test/src/typing_indicator_test.dart

@@ -54,12 +54,12 @@ void main() {
           ]));
 
       when(() => channelState.typingEvents).thenAnswer((i) => {
-            User(id: 'other-user', extraData: {'name': 'demo'}):
+            User(id: 'other-user', extraData: const {'name': 'demo'}):
                 Event(type: EventType.typingStart),
           });
       when(() => channelState.typingEventsStream)
           .thenAnswer((i) => Stream.value({
-                User(id: 'other-user', extraData: {'name': 'demo'}):
+                User(id: 'other-user', extraData: const {'name': 'demo'}):
                     Event(type: EventType.typingStart),
               }));