diff --git a/packages/devtools_app/fonts/Noto/NotoMusic-Regular.ttf b/packages/devtools_app/fonts/Noto/NotoMusic-Regular.ttf new file mode 100644 index 00000000000..115449480b6 Binary files /dev/null and b/packages/devtools_app/fonts/Noto/NotoMusic-Regular.ttf differ diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index e4eec892d86..812dd08e2e1 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -163,6 +163,9 @@ flutter: - family: Octicons fonts: - asset: fonts/Octicons.ttf + - family: Noto + fonts: + - asset: fonts/Noto/NotoMusic-Regular.ttf - family: Codicon fonts: - asset: packages/codicon/font/codicon.ttf diff --git a/packages/devtools_app_shared/lib/src/ui/theme/theme.dart b/packages/devtools_app_shared/lib/src/ui/theme/theme.dart index e01723a5574..e7a12425109 100644 --- a/packages/devtools_app_shared/lib/src/ui/theme/theme.dart +++ b/packages/devtools_app_shared/lib/src/ui/theme/theme.dart @@ -275,6 +275,7 @@ const densePadding = 4.0; const noPadding = 0.0; const defaultScrollBarOffset = 10.0; +const fallbackFonts = ['Noto']; // Other UI related constants: final defaultBorderRadius = BorderRadius.circular(_defaultBorderRadiusValue); @@ -344,6 +345,7 @@ extension ThemeDataExtension on ThemeData { TextStyle( color: colorScheme.onSurface, fontSize: defaultFontSize, + fontFamilyFallback: fallbackFonts, ), ); @@ -353,6 +355,7 @@ extension ThemeDataExtension on ThemeData { TextStyle get subtleTextStyle => fixBlurryText( TextStyle( color: colorScheme.subtleTextColor, + fontFamilyFallback: fallbackFonts, ), ); @@ -363,6 +366,7 @@ extension ThemeDataExtension on ThemeData { // Slightly smaller for fixes font text since it will appear larger // to begin with. fontSize: defaultFontSize - 1, + fontFamilyFallback: fallbackFonts, ), ); @@ -387,6 +391,7 @@ extension ThemeDataExtension on ThemeData { color: colorScheme._devtoolsLink, decoration: TextDecoration.underline, fontSize: defaultFontSize, + fontFamilyFallback: fallbackFonts, ), ); @@ -394,6 +399,7 @@ extension ThemeDataExtension on ThemeData { TextStyle( color: colorScheme._chartSubtleColor, fontSize: smallFontSize, + fontFamilyFallback: fallbackFonts, ), ); @@ -401,6 +407,7 @@ extension ThemeDataExtension on ThemeData { const TextStyle( color: Colors.black, backgroundColor: activeSearchMatchColor, + fontFamilyFallback: fallbackFonts, ), ); @@ -408,6 +415,7 @@ extension ThemeDataExtension on ThemeData { const TextStyle( color: Colors.black, backgroundColor: searchMatchColor, + fontFamilyFallback: fallbackFonts, ), ); @@ -416,6 +424,7 @@ extension ThemeDataExtension on ThemeData { fontWeight: FontWeight.normal, fontSize: smallFontSize, decoration: TextDecoration.none, + fontFamilyFallback: fallbackFonts, ), ); }