Merge branch 'develop' into cds-365

packages/stream_chat_flutter/example/lib/tutorial_part_3.dart

@@ -118,13 +118,12 @@ class ChannelListPage extends StatelessWidget {
         channel: channel,
       ),
       title: ChannelName(
-        textStyle:
-            StreamChatTheme.of(context).channelPreviewTheme.title!.copyWith(
-                  color: StreamChatTheme.of(context)
-                      .colorTheme
-                      .textHighEmphasis
-                      .withOpacity(opacity),
-                ),
+        textStyle: ChannelPreviewTheme.of(context).titleStyle!.copyWith(
+              color: StreamChatTheme.of(context)
+                  .colorTheme
+                  .textHighEmphasis
+                  .withOpacity(opacity),
+            ),
       ),
       subtitle: Text(subtitle),
       trailing: channel.state!.unreadCount > 0

packages/stream_chat_flutter/example/lib/tutorial_part_6.dart

@@ -58,17 +58,17 @@ class MyApp extends StatelessWidget {
     final defaultTheme = StreamChatThemeData.fromTheme(themeData);
     final colorTheme = defaultTheme.colorTheme;
     final customTheme = defaultTheme.merge(StreamChatThemeData(
-      channelPreviewTheme: ChannelPreviewTheme(
-        avatarTheme: AvatarTheme(
+      channelPreviewTheme: ChannelPreviewThemeData(
+        avatarTheme: AvatarThemeData(
           borderRadius: BorderRadius.circular(8),
         ),
       ),
-      otherMessageTheme: MessageTheme(
+      otherMessageTheme: MessageThemeData(
         messageBackgroundColor: colorTheme.textHighEmphasis,
-        messageText: TextStyle(
+        messageTextStyle: TextStyle(
           color: colorTheme.barsBg,
         ),
-        avatarTheme: AvatarTheme(
+        avatarTheme: AvatarThemeData(
           borderRadius: BorderRadius.circular(8),
         ),
       ),