improve on theming

renefloor · renefloor · commit 6add5d97e7b3 · 2026-03-20T14:52:32.000+01:00
diff --git a/melos.yaml b/melos.yaml
@@ -106,14 +106,13 @@ command:
 
     # List of all the dev_dependencies used in the project.
     dev_dependencies:
-      alchemist: ^0.13.0
+      alchemist: ^0.14.0
       build_runner: ^2.4.9
       connectivity_plus_platform_interface: ^2.0.0
       drift_dev: ^2.28.0
       fake_async: ^1.3.1
       faker_dart: ^0.2.1
       flutter_launcher_icons: ^0.14.2
-      golden_toolkit: ^0.15.0
       freezed: ">=2.4.2 <4.0.0"
       json_serializable: ^6.7.1
       mocktail: ^1.0.0
diff --git a/packages/docs_screenshots/pubspec.yaml b/packages/docs_screenshots/pubspec.yaml
@@ -20,8 +20,7 @@ dependencies:
   stream_chat_flutter: ^10.0.0-beta.12
 
 dev_dependencies:
-  alchemist: ^0.13.0
-  golden_toolkit: ^0.15.0
+  alchemist: ^0.14.0
   flutter_test:
     sdk: flutter
   mocktail: ^1.0.0
diff --git a/packages/docs_screenshots/test/channel/channel_header_test.dart b/packages/docs_screenshots/test/channel/channel_header_test.dart
@@ -16,6 +16,7 @@ Widget _buildChannelHeaderScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: StreamChannel(
         showLoading: false,
diff --git a/packages/docs_screenshots/test/channel/channel_list_header_test.dart b/packages/docs_screenshots/test/channel/channel_list_header_test.dart
@@ -16,6 +16,7 @@ Widget _buildListHeaderScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: Scaffold(
         appBar: header ?? const StreamChannelListHeader(),
diff --git a/packages/docs_screenshots/test/channel/channel_preview_test.dart b/packages/docs_screenshots/test/channel/channel_preview_test.dart
@@ -35,6 +35,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamChannelListItem(channel: channel),
@@ -119,6 +120,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamChannelListView(
@@ -156,6 +158,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: Swipeable(
diff --git a/packages/docs_screenshots/test/draft_list/draft_list_view_test.dart b/packages/docs_screenshots/test/draft_list/draft_list_view_test.dart
@@ -69,6 +69,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamDraftListView(
@@ -100,6 +101,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamDraftListTile(
@@ -140,6 +142,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamDraftListTile(
diff --git a/packages/docs_screenshots/test/flutter_test_config.dart b/packages/docs_screenshots/test/flutter_test_config.dart
@@ -2,15 +2,14 @@ import 'dart:async';
 
 import 'package:alchemist/alchemist.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:golden_toolkit/golden_toolkit.dart';
 
 Future<void> testExecutable(FutureOr<void> Function() testMain) async {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   // Flutter tests default to the Ahem font unless real fonts are loaded. This loads
   // Material/Cupertino fonts and every family listed in the merged FontManifest
   // (including transitive packages such as stream_core_flutter's Stream Icons).
-  await loadAppFonts();
+  await loadFonts();
 
   return AlchemistConfig.runWithConfig(
     config: AlchemistConfig(
diff --git a/packages/docs_screenshots/test/message_input/stream_message_input_test.dart b/packages/docs_screenshots/test/message_input/stream_message_input_test.dart
@@ -18,6 +18,7 @@ Widget _buildMessageInputScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: StreamChannel(
         showLoading: false,
diff --git a/packages/docs_screenshots/test/message_list/message_list_view_test.dart b/packages/docs_screenshots/test/message_list/message_list_view_test.dart
@@ -59,6 +59,7 @@ Widget _buildMessageListViewScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: StreamChannel(
         showLoading: false,
diff --git a/packages/docs_screenshots/test/message_list/message_widget_test.dart b/packages/docs_screenshots/test/message_list/message_widget_test.dart
@@ -20,6 +20,7 @@ Widget _buildMessageScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: StreamChannel(
         showLoading: false,
@@ -103,12 +104,13 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: StreamChatTheme(
             data: StreamChatThemeData.light().copyWith(
               ownMessageTheme: StreamMessageThemeData(
                 messageBackgroundColor: Colors.purple.shade100,
-                messageTextStyle: const TextStyle(color: Colors.purple),
+                messageTextStyle: const TextStyle(color: Colors.purple, fontFamily: 'Roboto'),
               ),
             ),
             child: StreamChannel(
@@ -208,6 +210,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: StreamChannel(
             showLoading: false,
diff --git a/packages/docs_screenshots/test/message_search/message_search_list_view_test.dart b/packages/docs_screenshots/test/message_search/message_search_list_view_test.dart
@@ -80,6 +80,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamMessageSearchListView(
diff --git a/packages/docs_screenshots/test/polls/poll_test.dart b/packages/docs_screenshots/test/polls/poll_test.dart
@@ -34,6 +34,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamPollCreatorWidget(
@@ -79,6 +80,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: SingleChildScrollView(
@@ -128,6 +130,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: StreamChannel(
             showLoading: false,
diff --git a/packages/docs_screenshots/test/src/golden_theme.dart b/packages/docs_screenshots/test/src/golden_theme.dart
@@ -1,15 +1,58 @@
 import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+import 'package:stream_core_flutter/stream_core_flutter.dart' as core;
+
+// ---------------------------------------------------------------------------
+// StreamTheme (stream_core_flutter) — drives new message text rendering
+// ---------------------------------------------------------------------------
+//
+// core.DefaultStreamMessageText reads its text style from
+// StreamTheme.of(context).textTheme.bodyDefault. Those styles carry no
+// fontFamily by default; when MarkdownBody passes them as the `p` style to
+// RichText, RichText does NOT inherit DefaultTextStyle, so Flutter falls back
+// to the Ahem test font (black rectangles).
+//
+// Fix: build a StreamTheme whose textTheme has fontFamily: 'Roboto' applied.
+//
+// ---------------------------------------------------------------------------
+// StreamChatThemeData (stream_chat_flutter) — drives legacy message rendering
+// ---------------------------------------------------------------------------
+//
+// StreamChatThemeData text styles (body, footnote, …) also carry no fontFamily.
+// Same Ahem problem for any remaining legacy widgets that go through
+// StreamMarkdownMessage → MarkdownBody → RichText.
+//
+// Fix: merge fontFamily: 'Roboto' into every StreamTextTheme style.
 
-/// Material theme for documentation goldens.
-///
-/// Subtitle previews use [DefaultTextStyle] + [Text.rich]; stream design tokens
-/// often omit [TextStyle.fontFamily]. For reliable glyphs, [loadAppFonts] must
-/// match a concrete family — M3 + explicit [fontFamily] pins **Roboto**.
 ThemeData docsScreenshotsTheme() {
+  final streamTextTheme = core.StreamTextTheme().apply(
+    color: core.StreamColorScheme.light().systemText,
+    fontFamily: 'Roboto',
+  );
+
   return ThemeData(
     useMaterial3: true,
     brightness: Brightness.light,
-    extensions: [StreamTheme.light()],
+    extensions: [
+      StreamTheme(brightness: Brightness.light, textTheme: streamTextTheme),
+    ],
+  );
+}
+
+StreamChatThemeData docsStreamChatThemeData() {
+  const roboto = TextStyle(fontFamily: 'Roboto');
+  final base = StreamChatThemeData.light();
+  final textTheme = base.textTheme.merge(
+    StreamTextTheme.light(
+      body: roboto,
+      bodyBold: roboto,
+      title: roboto,
+      headline: roboto,
+      headlineBold: roboto,
+      footnote: roboto,
+      footnoteBold: roboto,
+      captionBold: roboto,
+    ),
   );
+  return StreamChatThemeData.fromColorAndTextTheme(base.colorTheme, textTheme);
 }
diff --git a/packages/docs_screenshots/test/thread_list/thread_list_view_test.dart b/packages/docs_screenshots/test/thread_list/thread_list_view_test.dart
@@ -67,6 +67,7 @@ Widget _buildThreadListScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: Scaffold(
         body: StreamThreadListView(
@@ -182,26 +183,26 @@ void main() {
         unreadCount: 3,
       );
 
-      final controller = StreamThreadListController.fromValue(
-        PagedValue(items: [thread]),
-        client: client,
-      );
-
-      stubQueryThreadsForGoldens(client, [thread]);
-
-      return _buildThreadListScaffold(
-        client: client,
-        controller: controller,
-        customItemBuilder: (context, t) => Container(
-          decoration: BoxDecoration(
-            border: Border(
-              left: BorderSide(color: Theme.of(context).colorScheme.primary, width: 4),
+      return MaterialApp(
+        theme: docsScreenshotsTheme(),
+        debugShowCheckedModeBanner: false,
+        home: StreamChat(
+          client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
+          connectivityStream: Stream.value([ConnectivityResult.mobile]),
+          child: Scaffold(
+            body: Container(
+              decoration: BoxDecoration(
+                border: Border(
+                  left: BorderSide(color: Colors.blue.shade700, width: 4),
+                ),
+              ),
+              child: StreamThreadListTile(
+                thread: thread,
+                currentUser: _user1,
+              ),
             ),
           ),
-          child: StreamThreadListTile(
-            thread: t,
-            currentUser: _user1,
-          ),
         ),
       );
     },
@@ -218,6 +219,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamUnreadThreadsBanner(
diff --git a/packages/docs_screenshots/test/user_list/user_list_view_test.dart b/packages/docs_screenshots/test/user_list/user_list_view_test.dart
@@ -38,6 +38,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: StreamUserListView(
diff --git a/packages/docs_screenshots/test/voice_recording/voice_recording_test.dart b/packages/docs_screenshots/test/voice_recording/voice_recording_test.dart
@@ -20,6 +20,7 @@ Widget _buildRecorderButtonScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: StreamChannel(
         showLoading: false,
@@ -43,6 +44,7 @@ Widget _buildVoiceRecordingMessageInputScaffold({
     debugShowCheckedModeBanner: false,
     home: StreamChat(
       client: client,
+      streamChatThemeData: docsStreamChatThemeData(),
       connectivityStream: Stream.value([ConnectivityResult.mobile]),
       child: StreamChannel(
         showLoading: false,
@@ -244,6 +246,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: Padding(
@@ -282,6 +285,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: Padding(
@@ -319,6 +323,7 @@ void main() {
         debugShowCheckedModeBanner: false,
         home: StreamChat(
           client: client,
+          streamChatThemeData: docsStreamChatThemeData(),
           connectivityStream: Stream.value([ConnectivityResult.mobile]),
           child: Scaffold(
             body: Padding(
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
@@ -72,7 +72,7 @@ dependencies:
   video_player: ^2.8.7
 
 dev_dependencies:
-  alchemist: ^0.13.0
+  alchemist: ^0.14.0
   connectivity_plus_platform_interface: ^2.0.0
   faker_dart: ^0.2.1
   flutter_test:
