Skip to content

Commit 93a1701

Browse files
app: correctly propogate emoji font fallback
1 parent 7481f0e commit 93a1701

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

lib/widgets/app.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class ZulipApp extends StatelessWidget {
1212
@override
1313
Widget build(BuildContext context) {
1414
final theme = ThemeData(
15+
fontFamilyFallback: const <String>['sans-serif', 'Noto Color Emoji'],
1516
useMaterial3: false, // TODO(#225) fix things and switch to true
1617
// This applies Material 3's color system to produce a palette of
1718
// appropriately matching and contrasting colors for use in a UI.

lib/widgets/message_list.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class _MessageListState extends State<MessageList> with PerAccountStoreAwareStat
191191
assert(model != null);
192192
if (!model!.fetched) return const Center(child: CircularProgressIndicator());
193193

194-
return DefaultTextStyle(
194+
return DefaultTextStyle.merge(
195195
// TODO figure out text color -- web is supposedly hsl(0deg 0% 20%),
196196
// but seems much darker than that
197197
style: const TextStyle(color: Color.fromRGBO(0, 0, 0, 1)),

0 commit comments

Comments
 (0)