Unverified Commit 1aabe314 authored by Rami's avatar Rami Committed by GitHub

[Material 3] Update TextTheme to have M3 names for styles (#93725)

parent bb906b6b
......@@ -373,17 +373,19 @@ void main() {
List<TextStyle> extractStyles(TextTheme textTheme) {
return <TextStyle>[
textTheme.headline1!,
textTheme.headline2!,
textTheme.headline3!,
textTheme.headline4!,
textTheme.headline5!,
textTheme.headline6!,
textTheme.subtitle1!,
textTheme.bodyText1!,
textTheme.bodyText2!,
textTheme.caption!,
textTheme.button!,
textTheme.displayLarge!,
textTheme.displayMedium!,
textTheme.displaySmall!,
textTheme.headlineLarge!,
textTheme.headlineMedium!,
textTheme.headlineSmall!,
textTheme.titleLarge!,
textTheme.titleMedium!,
textTheme.bodyLarge!,
textTheme.bodyMedium!,
textTheme.bodySmall!,
textTheme.labelLarge!,
textTheme.labelMedium!,
];
}
......@@ -408,7 +410,7 @@ void main() {
}
}
expect(theme.textTheme.headline1!.debugLabel, '(englishLike display4 2014).merge(blackMountainView headline1)');
expect(theme.textTheme.displayLarge!.debugLabel, '(englishLike displayLarge 2014).merge(blackMountainView displayLarge)');
});
group('Cupertino theme', () {
......
......@@ -584,7 +584,7 @@ void main() {
expect(textStyle.color, Colors.white);
expect(textStyle.fontFamily, 'Roboto');
expect(textStyle.decoration, TextDecoration.none);
expect(textStyle.debugLabel, '((englishLike body1 2014).merge(blackMountainView bodyText2)).copyWith');
expect(textStyle.debugLabel, '((englishLike bodyMedium 2014).merge(blackMountainView bodyMedium)).copyWith');
});
testWidgets('Default tooltip message textStyle - dark', (WidgetTester tester) async {
......@@ -610,7 +610,7 @@ void main() {
expect(textStyle.color, Colors.black);
expect(textStyle.fontFamily, 'Roboto');
expect(textStyle.decoration, TextDecoration.none);
expect(textStyle.debugLabel, '((englishLike body1 2014).merge(whiteMountainView bodyText2)).copyWith');
expect(textStyle.debugLabel, '((englishLike bodyMedium 2014).merge(whiteMountainView bodyMedium)).copyWith');
});
testWidgets('Custom tooltip message textStyle', (WidgetTester tester) async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment