Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 047fc60

Browse files
author
Harry Terkelsen
authored
Switch from Noto Emoji to Noto Color Emoji and update font data (#40666)
1 parent 4a25940 commit 047fc60

File tree

4 files changed

+49
-43
lines changed

4 files changed

+49
-43
lines changed

lib/web_ui/dev/generate_fallback_font_data.dart

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ class GenerateFallbackFontDataCommand extends Command<bool>
6464
final Map<String, Uri> urlForFamily = <String, Uri>{};
6565
for (final Map<String, dynamic> fontData in fontDatas) {
6666
if (fallbackFonts.contains(fontData['family'])) {
67-
final Uri uri = Uri.parse(fontData['files']['regular'] as String).replace(scheme: 'https');
67+
final Uri uri = Uri.parse(fontData['files']['regular'] as String)
68+
.replace(scheme: 'https');
6869
urlForFamily[fontData['family'] as String] = uri;
6970
}
7071
}
@@ -82,7 +83,11 @@ class GenerateFallbackFontDataCommand extends Command<bool>
8283
}
8384
for (final String family in fallbackFonts) {
8485
print('Downloading $family...');
85-
final Uri uri = urlForFamily[family]!;
86+
final Uri? uri = urlForFamily[family];
87+
if (uri == null) {
88+
throw ToolExit('Unable to determine URL to download $family. '
89+
'Check if it is still hosted on Google Fonts.');
90+
}
8691
final http.Response fontResponse = await client.get(uri);
8792
if (fontResponse.statusCode != 200) {
8893
throw ToolExit('Failed to download font for $family');
@@ -160,7 +165,7 @@ class GenerateFallbackFontDataCommand extends Command<bool>
160165

161166
const List<String> fallbackFonts = <String>[
162167
'Noto Sans',
163-
'Noto Emoji',
168+
'Noto Color Emoji',
164169
'Noto Sans Symbols',
165170
'Noto Sans Symbols 2',
166171
'Noto Sans Adlam',
@@ -242,7 +247,7 @@ const List<String> fallbackFonts = <String>[
242247
'Noto Sans Mro',
243248
'Noto Sans Multani',
244249
'Noto Sans Myanmar',
245-
'Noto Sans N Ko',
250+
'Noto Sans NKo',
246251
'Noto Sans Nabataean',
247252
'Noto Sans New Tai Lue',
248253
'Noto Sans Newa',

0 commit comments

Comments
 (0)