Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
3 changes: 3 additions & 0 deletions packages/devtools_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ flutter:
- family: Octicons
fonts:
- asset: fonts/Octicons.ttf
- family: Noto
fonts:
- asset: fonts/Noto/NotoMusic-Regular.ttf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

before we add this we should make sure this already exists in g3 and will not block our roll.

- family: Codicon
fonts:
- asset: packages/codicon/font/codicon.ttf
Expand Down
9 changes: 9 additions & 0 deletions packages/devtools_app_shared/lib/src/ui/theme/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -344,6 +345,7 @@ extension ThemeDataExtension on ThemeData {
TextStyle(
color: colorScheme.onSurface,
fontSize: defaultFontSize,
fontFamilyFallback: fallbackFonts,
),
);

Expand All @@ -353,6 +355,7 @@ extension ThemeDataExtension on ThemeData {
TextStyle get subtleTextStyle => fixBlurryText(
TextStyle(
color: colorScheme.subtleTextColor,
fontFamilyFallback: fallbackFonts,
),
);

Expand All @@ -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,
),
);

Expand All @@ -387,27 +391,31 @@ extension ThemeDataExtension on ThemeData {
color: colorScheme._devtoolsLink,
decoration: TextDecoration.underline,
fontSize: defaultFontSize,
fontFamilyFallback: fallbackFonts,
),
);

TextStyle get subtleChartTextStyle => fixBlurryText(
TextStyle(
color: colorScheme._chartSubtleColor,
fontSize: smallFontSize,
fontFamilyFallback: fallbackFonts,
),
);

TextStyle get searchMatchHighlightStyle => fixBlurryText(
const TextStyle(
color: Colors.black,
backgroundColor: activeSearchMatchColor,
fontFamilyFallback: fallbackFonts,
),
);

TextStyle get searchMatchHighlightStyleFocused => fixBlurryText(
const TextStyle(
color: Colors.black,
backgroundColor: searchMatchColor,
fontFamilyFallback: fallbackFonts,
),
);

Expand All @@ -416,6 +424,7 @@ extension ThemeDataExtension on ThemeData {
fontWeight: FontWeight.normal,
fontSize: smallFontSize,
decoration: TextDecoration.none,
fontFamilyFallback: fallbackFonts,
),
);
}
Expand Down