update deprecated text theme parameters (#2490)
* update deprecated text theme parameters
* auto format
* Update text theme parameters
* update version number
* temp lower target test cover to allow flutter roll
* Revert "temp lower target test cover to allow flutter roll"
This reverts commit f461918ceb5dad30d331a8909ee31438a768114d.
* updates nit
diff --git a/packages/adaptive_scaffold/CHANGELOG.md b/packages/adaptive_scaffold/CHANGELOG.md
index fd17e71..c9d596f 100644
--- a/packages/adaptive_scaffold/CHANGELOG.md
+++ b/packages/adaptive_scaffold/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.1+1
+
+* Updates text theme parameters to avoid deprecation issues.
+
## 0.0.1
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/packages/adaptive_scaffold/example/lib/main.dart b/packages/adaptive_scaffold/example/lib/main.dart
index 72cf851..31bc684 100644
--- a/packages/adaptive_scaffold/example/lib/main.dart
+++ b/packages/adaptive_scaffold/example/lib/main.dart
@@ -478,10 +478,10 @@
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(item.name,
- style: Theme.of(context).textTheme.bodyText1),
+ style: Theme.of(context).textTheme.bodyLarge),
const SizedBox(height: 3),
Text('${item.time} ago',
- style: Theme.of(context).textTheme.caption),
+ style: Theme.of(context).textTheme.bodySmall),
],
),
const Spacer(),
@@ -499,7 +499,7 @@
style: Theme.of(context).textTheme.titleMedium),
const SizedBox(height: 4),
Text(item.body.replaceRange(80, item.body.length, '...'),
- style: Theme.of(context).textTheme.bodyText1),
+ style: Theme.of(context).textTheme.bodyLarge),
],
),
),
diff --git a/packages/adaptive_scaffold/pubspec.yaml b/packages/adaptive_scaffold/pubspec.yaml
index a88e9b3..a0a1b0a 100644
--- a/packages/adaptive_scaffold/pubspec.yaml
+++ b/packages/adaptive_scaffold/pubspec.yaml
@@ -1,6 +1,6 @@
name: adaptive_scaffold
description: Widgets to easily build adaptive layouts, including navigation elements.
-version: 0.0.1
+version: 0.0.1+1
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3A%22p%3A+adaptive_scaffold%22
repository: https://github.com/flutter/packages/tree/main/packages/adaptive_scaffold
# Temporarily unpublished while in process of releasing full package in multiple stages.
diff --git a/packages/animations/CHANGELOG.md b/packages/animations/CHANGELOG.md
index 6fa3537..92411a7 100644
--- a/packages/animations/CHANGELOG.md
+++ b/packages/animations/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates text theme parameters to avoid deprecation issues.
+
## 2.0.3
* Updates for non-nullable bindings.
diff --git a/packages/animations/example/lib/container_transition.dart b/packages/animations/example/lib/container_transition.dart
index 50a8423..9362d42 100644
--- a/packages/animations/example/lib/container_transition.dart
+++ b/packages/animations/example/lib/container_transition.dart
@@ -74,7 +74,7 @@
children: <Widget>[
Text(
'Fade mode',
- style: Theme.of(context).textTheme.caption,
+ style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(height: 12),
ToggleButtons(
@@ -336,7 +336,7 @@
'adipiscing elit, sed do eiusmod tempor.',
style: Theme.of(context)
.textTheme
- .bodyText2!
+ .bodyMedium!
.copyWith(color: Colors.black54),
),
),
@@ -382,12 +382,12 @@
children: <Widget>[
Text(
'Title',
- style: Theme.of(context).textTheme.headline6,
+ style: Theme.of(context).textTheme.titleLarge,
),
const SizedBox(height: 4),
Text(
subtitle,
- style: Theme.of(context).textTheme.caption,
+ style: Theme.of(context).textTheme.bodySmall,
),
],
),
@@ -432,13 +432,13 @@
children: <Widget>[
Text(
'Title',
- style: Theme.of(context).textTheme.subtitle1,
+ style: Theme.of(context).textTheme.titleMedium,
),
const SizedBox(height: 8),
Text(
'Lorem ipsum dolor sit amet, consectetur '
'adipiscing elit,',
- style: Theme.of(context).textTheme.caption),
+ style: Theme.of(context).textTheme.bodySmall),
],
),
),
@@ -511,7 +511,7 @@
children: <Widget>[
Text(
'Title',
- style: Theme.of(context).textTheme.headline5!.copyWith(
+ style: Theme.of(context).textTheme.headlineSmall!.copyWith(
color: Colors.black54,
fontSize: 30.0,
),
@@ -519,7 +519,7 @@
const SizedBox(height: 10),
Text(
_loremIpsumParagraph,
- style: Theme.of(context).textTheme.bodyText2!.copyWith(
+ style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Colors.black54,
height: 1.5,
fontSize: 16.0,
diff --git a/packages/animations/example/lib/fade_through_transition.dart b/packages/animations/example/lib/fade_through_transition.dart
index 4f94dd1..978af59 100644
--- a/packages/animations/example/lib/fade_through_transition.dart
+++ b/packages/animations/example/lib/fade_through_transition.dart
@@ -96,11 +96,11 @@
children: <Widget>[
Text(
'123 photos',
- style: Theme.of(context).textTheme.bodyText1,
+ style: Theme.of(context).textTheme.bodyLarge,
),
Text(
'123 photos',
- style: Theme.of(context).textTheme.caption,
+ style: Theme.of(context).textTheme.bodySmall,
),
],
),
diff --git a/packages/animations/example/lib/shared_axis_transition.dart b/packages/animations/example/lib/shared_axis_transition.dart
index 8f70958..8fd6d1d 100644
--- a/packages/animations/example/lib/shared_axis_transition.dart
+++ b/packages/animations/example/lib/shared_axis_transition.dart
@@ -121,7 +121,7 @@
const Padding(padding: EdgeInsets.symmetric(vertical: 8.0)),
Text(
'Streamling your courses',
- style: Theme.of(context).textTheme.headline5,
+ style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.center,
),
const Padding(padding: EdgeInsets.symmetric(vertical: 5.0)),
@@ -193,7 +193,7 @@
Padding(padding: EdgeInsets.symmetric(vertical: maxHeight / 50)),
Text(
'Hi David Park',
- style: Theme.of(context).textTheme.headline5,
+ style: Theme.of(context).textTheme.headlineSmall,
),
Padding(padding: EdgeInsets.symmetric(vertical: maxHeight / 50)),
const Text(
diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md
index 091ab1e..d85c36b 100644
--- a/packages/flutter_markdown/CHANGELOG.md
+++ b/packages/flutter_markdown/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.10+4
+
+* Updates text theme parameters to avoid deprecation issues.
+
## 0.6.10+3
* Fixes shrinkWrap not taken into account with single child ([flutter/flutter#105299](https://github.com/flutter/flutter/issues/105299)).
diff --git a/packages/flutter_markdown/example/lib/demos/basic_markdown_demo.dart b/packages/flutter_markdown/example/lib/demos/basic_markdown_demo.dart
index 7721a36..76557f6 100644
--- a/packages/flutter_markdown/example/lib/demos/basic_markdown_demo.dart
+++ b/packages/flutter_markdown/example/lib/demos/basic_markdown_demo.dart
@@ -139,22 +139,22 @@
children: <Widget>[
Text(
'See the following link for more information:',
- style: Theme.of(context).textTheme.bodyText1,
+ style: Theme.of(context).textTheme.bodyLarge,
),
const SizedBox(height: 8),
Text(
'Link text: $text',
- style: Theme.of(context).textTheme.bodyText2,
+ style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 8),
Text(
'Link destination: $href',
- style: Theme.of(context).textTheme.bodyText2,
+ style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 8),
Text(
'Link title: $title',
- style: Theme.of(context).textTheme.bodyText2,
+ style: Theme.of(context).textTheme.bodyMedium,
),
],
),
diff --git a/packages/flutter_markdown/example/lib/screens/demo_card.dart b/packages/flutter_markdown/example/lib/screens/demo_card.dart
index d60c95d..284226e 100644
--- a/packages/flutter_markdown/example/lib/screens/demo_card.dart
+++ b/packages/flutter_markdown/example/lib/screens/demo_card.dart
@@ -37,14 +37,14 @@
children: <Widget>[
Text(
widget.title,
- style: Theme.of(context).primaryTextTheme.headline5,
+ style: Theme.of(context).primaryTextTheme.headlineSmall,
),
const SizedBox(
height: 6,
),
Text(
widget.description,
- style: Theme.of(context).primaryTextTheme.bodyText1,
+ style: Theme.of(context).primaryTextTheme.bodyLarge,
),
],
),
diff --git a/packages/flutter_markdown/example/lib/screens/demo_screen.dart b/packages/flutter_markdown/example/lib/screens/demo_screen.dart
index 30409b9..041d2d8 100644
--- a/packages/flutter_markdown/example/lib/screens/demo_screen.dart
+++ b/packages/flutter_markdown/example/lib/screens/demo_screen.dart
@@ -82,7 +82,7 @@
softWrap: true,
style: Theme.of(context)
.primaryTextTheme
- .bodyText1!
+ .bodyLarge!
.copyWith(fontFamily: 'Roboto Mono', color: Colors.black),
),
),
@@ -129,22 +129,22 @@
children: <Widget>[
Text(
'See the following link for more information:',
- style: Theme.of(context).textTheme.bodyText1,
+ style: Theme.of(context).textTheme.bodyLarge,
),
const SizedBox(height: 8),
Text(
'Link text: $text',
- style: Theme.of(context).textTheme.bodyText2,
+ style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 8),
Text(
'Link destination: $href',
- style: Theme.of(context).textTheme.bodyText2,
+ style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 8),
Text(
'Link title: $title',
- style: Theme.of(context).textTheme.bodyText2,
+ style: Theme.of(context).textTheme.bodyMedium,
),
],
),
diff --git a/packages/flutter_markdown/example/lib/shared/dropdown_menu.dart b/packages/flutter_markdown/example/lib/shared/dropdown_menu.dart
index 062a758..3d0af77 100644
--- a/packages/flutter_markdown/example/lib/shared/dropdown_menu.dart
+++ b/packages/flutter_markdown/example/lib/shared/dropdown_menu.dart
@@ -54,7 +54,7 @@
children: <Widget>[
Text(
label,
- style: labelStyle ?? Theme.of(context).textTheme.subtitle1,
+ style: labelStyle ?? Theme.of(context).textTheme.titleMedium,
),
Container(
color: menuItemBackground,
diff --git a/packages/flutter_markdown/lib/src/style_sheet.dart b/packages/flutter_markdown/lib/src/style_sheet.dart
index 9a7e676..f9feee0 100644
--- a/packages/flutter_markdown/lib/src/style_sheet.dart
+++ b/packages/flutter_markdown/lib/src/style_sheet.dart
@@ -84,42 +84,42 @@
/// Creates a [MarkdownStyleSheet] from the [TextStyle]s in the provided [ThemeData].
factory MarkdownStyleSheet.fromTheme(ThemeData theme) {
- assert(theme.textTheme.bodyText2?.fontSize != null);
+ assert(theme.textTheme.bodyMedium?.fontSize != null);
return MarkdownStyleSheet(
a: const TextStyle(color: Colors.blue),
- p: theme.textTheme.bodyText2,
+ p: theme.textTheme.bodyMedium,
pPadding: EdgeInsets.zero,
- code: theme.textTheme.bodyText2!.copyWith(
+ code: theme.textTheme.bodyMedium!.copyWith(
backgroundColor: theme.cardTheme.color ?? theme.cardColor,
fontFamily: 'monospace',
- fontSize: theme.textTheme.bodyText2!.fontSize! * 0.85,
+ fontSize: theme.textTheme.bodyMedium!.fontSize! * 0.85,
),
- h1: theme.textTheme.headline5,
+ h1: theme.textTheme.headlineSmall,
h1Padding: EdgeInsets.zero,
- h2: theme.textTheme.headline6,
+ h2: theme.textTheme.titleLarge,
h2Padding: EdgeInsets.zero,
- h3: theme.textTheme.subtitle1,
+ h3: theme.textTheme.titleMedium,
h3Padding: EdgeInsets.zero,
- h4: theme.textTheme.bodyText1,
+ h4: theme.textTheme.bodyLarge,
h4Padding: EdgeInsets.zero,
- h5: theme.textTheme.bodyText1,
+ h5: theme.textTheme.bodyLarge,
h5Padding: EdgeInsets.zero,
- h6: theme.textTheme.bodyText1,
+ h6: theme.textTheme.bodyLarge,
h6Padding: EdgeInsets.zero,
em: const TextStyle(fontStyle: FontStyle.italic),
strong: const TextStyle(fontWeight: FontWeight.bold),
del: const TextStyle(decoration: TextDecoration.lineThrough),
- blockquote: theme.textTheme.bodyText2,
- img: theme.textTheme.bodyText2,
- checkbox: theme.textTheme.bodyText2!.copyWith(
+ blockquote: theme.textTheme.bodyMedium,
+ img: theme.textTheme.bodyMedium,
+ checkbox: theme.textTheme.bodyMedium!.copyWith(
color: theme.primaryColor,
),
blockSpacing: 8.0,
listIndent: 24.0,
- listBullet: theme.textTheme.bodyText2,
+ listBullet: theme.textTheme.bodyMedium,
listBulletPadding: const EdgeInsets.only(right: 4),
tableHead: const TextStyle(fontWeight: FontWeight.w600),
- tableBody: theme.textTheme.bodyText2,
+ tableBody: theme.textTheme.bodyMedium,
tableHeadAlign: TextAlign.center,
tableBorder: TableBorder.all(
color: theme.dividerColor,
@@ -267,39 +267,39 @@
factory MarkdownStyleSheet.largeFromTheme(ThemeData theme) {
return MarkdownStyleSheet(
a: const TextStyle(color: Colors.blue),
- p: theme.textTheme.bodyText2,
+ p: theme.textTheme.bodyMedium,
pPadding: EdgeInsets.zero,
- code: theme.textTheme.bodyText2!.copyWith(
+ code: theme.textTheme.bodyMedium!.copyWith(
backgroundColor: theme.cardTheme.color ?? theme.cardColor,
fontFamily: 'monospace',
- fontSize: theme.textTheme.bodyText2!.fontSize! * 0.85,
+ fontSize: theme.textTheme.bodyMedium!.fontSize! * 0.85,
),
- h1: theme.textTheme.headline2,
+ h1: theme.textTheme.displayMedium,
h1Padding: EdgeInsets.zero,
- h2: theme.textTheme.headline3,
+ h2: theme.textTheme.displaySmall,
h2Padding: EdgeInsets.zero,
- h3: theme.textTheme.headline4,
+ h3: theme.textTheme.headlineMedium,
h3Padding: EdgeInsets.zero,
- h4: theme.textTheme.headline5,
+ h4: theme.textTheme.headlineSmall,
h4Padding: EdgeInsets.zero,
- h5: theme.textTheme.headline6,
+ h5: theme.textTheme.titleLarge,
h5Padding: EdgeInsets.zero,
- h6: theme.textTheme.subtitle1,
+ h6: theme.textTheme.titleMedium,
h6Padding: EdgeInsets.zero,
em: const TextStyle(fontStyle: FontStyle.italic),
strong: const TextStyle(fontWeight: FontWeight.bold),
del: const TextStyle(decoration: TextDecoration.lineThrough),
- blockquote: theme.textTheme.bodyText2,
- img: theme.textTheme.bodyText2,
- checkbox: theme.textTheme.bodyText2!.copyWith(
+ blockquote: theme.textTheme.bodyMedium,
+ img: theme.textTheme.bodyMedium,
+ checkbox: theme.textTheme.bodyMedium!.copyWith(
color: theme.primaryColor,
),
blockSpacing: 8.0,
listIndent: 24.0,
- listBullet: theme.textTheme.bodyText2,
+ listBullet: theme.textTheme.bodyMedium,
listBulletPadding: const EdgeInsets.only(right: 4),
tableHead: const TextStyle(fontWeight: FontWeight.w600),
- tableBody: theme.textTheme.bodyText2,
+ tableBody: theme.textTheme.bodyMedium,
tableHeadAlign: TextAlign.center,
tableBorder: TableBorder.all(
color: theme.dividerColor,
diff --git a/packages/flutter_markdown/pubspec.yaml b/packages/flutter_markdown/pubspec.yaml
index 716fca4..8aefa93 100644
--- a/packages/flutter_markdown/pubspec.yaml
+++ b/packages/flutter_markdown/pubspec.yaml
@@ -4,7 +4,7 @@
formatted with simple Markdown tags.
repository: https://github.com/flutter/packages/tree/main/packages/flutter_markdown
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_markdown%22
-version: 0.6.10+3
+version: 0.6.10+4
environment:
sdk: ">=2.12.0 <3.0.0"
diff --git a/packages/flutter_markdown/test/blockquote_test.dart b/packages/flutter_markdown/test/blockquote_test.dart
index 1ded2dc..2105549 100644
--- a/packages/flutter_markdown/test/blockquote_test.dart
+++ b/packages/flutter_markdown/test/blockquote_test.dart
@@ -73,7 +73,7 @@
expect(styledTextParts[0].text, 'this is a link: ');
expect(
styledTextParts[0].style!.color,
- theme.textTheme.bodyText2!.color,
+ theme.textTheme.bodyMedium!.color,
);
/// Markdown guide
@@ -84,7 +84,7 @@
expect(styledTextParts[2].text, ' and this is ');
expect(
styledTextParts[2].style!.color,
- theme.textTheme.bodyText2!.color,
+ theme.textTheme.bodyMedium!.color,
);
/// bold
@@ -95,7 +95,7 @@
expect(styledTextParts[4].text, ' and ');
expect(
styledTextParts[4].style!.color,
- theme.textTheme.bodyText2!.color,
+ theme.textTheme.bodyMedium!.color,
);
/// italic
diff --git a/packages/flutter_markdown/test/style_sheet_test.dart b/packages/flutter_markdown/test/style_sheet_test.dart
index 349e8e6..89f5e13 100644
--- a/packages/flutter_markdown/test/style_sheet_test.dart
+++ b/packages/flutter_markdown/test/style_sheet_test.dart
@@ -135,7 +135,7 @@
(WidgetTester tester) async {
final ThemeData theme = ThemeData.dark().copyWith(
textTheme: const TextTheme(
- bodyText2: TextStyle(fontSize: 12.0),
+ bodyMedium: TextStyle(fontSize: 12.0),
),
);
@@ -145,60 +145,60 @@
expect(style.a!.color, Colors.blue);
// p
- expect(style.p, theme.textTheme.bodyText2);
+ expect(style.p, theme.textTheme.bodyMedium);
// code
- expect(style.code!.color, theme.textTheme.bodyText2!.color);
+ expect(style.code!.color, theme.textTheme.bodyMedium!.color);
expect(
- style.code!.fontSize, theme.textTheme.bodyText2!.fontSize! * 0.85);
+ style.code!.fontSize, theme.textTheme.bodyMedium!.fontSize! * 0.85);
expect(style.code!.fontFamily, 'monospace');
expect(style.code!.backgroundColor, theme.cardColor);
// H1
- expect(style.h1, theme.textTheme.headline5);
+ expect(style.h1, theme.textTheme.headlineSmall);
// H2
- expect(style.h2, theme.textTheme.headline6);
+ expect(style.h2, theme.textTheme.titleLarge);
// H3
- expect(style.h3, theme.textTheme.subtitle1);
+ expect(style.h3, theme.textTheme.titleMedium);
// H4
- expect(style.h4, theme.textTheme.bodyText1);
+ expect(style.h4, theme.textTheme.bodyLarge);
// H5
- expect(style.h5, theme.textTheme.bodyText1);
+ expect(style.h5, theme.textTheme.bodyLarge);
// H6
- expect(style.h6, theme.textTheme.bodyText1);
+ expect(style.h6, theme.textTheme.bodyLarge);
// em
expect(style.em!.fontStyle, FontStyle.italic);
- expect(style.em!.color, theme.textTheme.bodyText2!.color);
+ expect(style.em!.color, theme.textTheme.bodyMedium!.color);
// strong
expect(style.strong!.fontWeight, FontWeight.bold);
- expect(style.strong!.color, theme.textTheme.bodyText2!.color);
+ expect(style.strong!.color, theme.textTheme.bodyMedium!.color);
// del
expect(style.del!.decoration, TextDecoration.lineThrough);
- expect(style.del!.color, theme.textTheme.bodyText2!.color);
+ expect(style.del!.color, theme.textTheme.bodyMedium!.color);
// blockqoute
- expect(style.blockquote, theme.textTheme.bodyText2);
+ expect(style.blockquote, theme.textTheme.bodyMedium);
// img
- expect(style.img, theme.textTheme.bodyText2);
+ expect(style.img, theme.textTheme.bodyMedium);
// checkbox
expect(style.checkbox!.color, theme.primaryColor);
- expect(style.checkbox!.fontSize, theme.textTheme.bodyText2!.fontSize);
+ expect(style.checkbox!.fontSize, theme.textTheme.bodyMedium!.fontSize);
// tableHead
expect(style.tableHead!.fontWeight, FontWeight.w600);
// tableBody
- expect(style.tableBody, theme.textTheme.bodyText2);
+ expect(style.tableBody, theme.textTheme.bodyMedium);
},
);
@@ -216,7 +216,7 @@
final MarkdownStyleSheet merged = style1.merge(style2);
expect(merged.p!.color, Colors.red);
expect(merged.blockquote!.fontSize, 16);
- expect(merged.blockquote!.color, theme.textTheme.bodyText2!.color);
+ expect(merged.blockquote!.color, theme.textTheme.bodyMedium!.color);
},
);
diff --git a/packages/flutter_markdown/test/utils.dart b/packages/flutter_markdown/test/utils.dart
index 0f1a092..3286260 100644
--- a/packages/flutter_markdown/test/utils.dart
+++ b/packages/flutter_markdown/test/utils.dart
@@ -13,7 +13,7 @@
final TextTheme textTheme =
Typography.material2018(platform: TargetPlatform.android)
.black
- .merge(const TextTheme(bodyText2: TextStyle(fontSize: 12.0)));
+ .merge(const TextTheme(bodyMedium: TextStyle(fontSize: 12.0)));
void expectWidgetTypes(Iterable<Widget> widgets, List<Type> expected) {
final List<Type> actual = widgets.map((Widget w) => w.runtimeType).toList();
diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md
index 69b1b70..be1fbca 100644
--- a/packages/go_router/CHANGELOG.md
+++ b/packages/go_router/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Updates text theme parameters to avoid deprecation issues.
+
## 4.2.8
- Fixes namedLocation to return URIs without trailing question marks if there are no query parameters.
diff --git a/packages/go_router/example/lib/books/src/screens/book_details.dart b/packages/go_router/example/lib/books/src/screens/book_details.dart
index d26ff71..0bc724e 100644
--- a/packages/go_router/example/lib/books/src/screens/book_details.dart
+++ b/packages/go_router/example/lib/books/src/screens/book_details.dart
@@ -38,11 +38,11 @@
children: <Widget>[
Text(
book!.title,
- style: Theme.of(context).textTheme.headline4,
+ style: Theme.of(context).textTheme.headlineMedium,
),
Text(
book!.author.name,
- style: Theme.of(context).textTheme.subtitle1,
+ style: Theme.of(context).textTheme.titleMedium,
),
TextButton(
onPressed: () {
diff --git a/packages/go_router/example/lib/books/src/screens/settings.dart b/packages/go_router/example/lib/books/src/screens/settings.dart
index 5634bc2..a376ce2 100644
--- a/packages/go_router/example/lib/books/src/screens/settings.dart
+++ b/packages/go_router/example/lib/books/src/screens/settings.dart
@@ -52,7 +52,7 @@
...<Widget>[
Text(
'Settings',
- style: Theme.of(context).textTheme.headline4,
+ style: Theme.of(context).textTheme.headlineMedium,
),
ElevatedButton(
onPressed: () {
diff --git a/packages/go_router/example/lib/books/src/screens/sign_in.dart b/packages/go_router/example/lib/books/src/screens/sign_in.dart
index 808bc15..1f833bf 100644
--- a/packages/go_router/example/lib/books/src/screens/sign_in.dart
+++ b/packages/go_router/example/lib/books/src/screens/sign_in.dart
@@ -46,7 +46,8 @@
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
- Text('Sign in', style: Theme.of(context).textTheme.headline4),
+ Text('Sign in',
+ style: Theme.of(context).textTheme.headlineMedium),
TextField(
decoration: const InputDecoration(labelText: 'Username'),
controller: _usernameController,
diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index 37b2095..da9e4d8 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.2.9
+
+* Updates text theme parameters to avoid deprecation issues.
+
## 3.2.8
* [dart] Deduces the correct import statement for Dart test files made with
diff --git a/packages/pigeon/e2e_tests/test_objc/lib/main.dart b/packages/pigeon/e2e_tests/test_objc/lib/main.dart
index fbff926..804bb9f 100644
--- a/packages/pigeon/e2e_tests/test_objc/lib/main.dart
+++ b/packages/pigeon/e2e_tests/test_objc/lib/main.dart
@@ -73,11 +73,11 @@
),
Text(
_message,
- style: Theme.of(context).textTheme.headline1,
+ style: Theme.of(context).textTheme.displayLarge,
),
Text(
_state.toString(),
- style: Theme.of(context).textTheme.headline1,
+ style: Theme.of(context).textTheme.displayLarge,
),
],
),
diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart
index 277806b..b20bb6b 100644
--- a/packages/pigeon/lib/generator_tools.dart
+++ b/packages/pigeon/lib/generator_tools.dart
@@ -9,7 +9,7 @@
import 'ast.dart';
/// The current version of pigeon. This must match the version in pubspec.yaml.
-const String pigeonVersion = '3.2.8';
+const String pigeonVersion = '3.2.9';
/// Read all the content from [stdin] to a String.
String readStdin() {
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index ad40950..3afef04 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -2,7 +2,7 @@
description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
repository: https://github.com/flutter/packages/tree/main/packages/pigeon
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apigeon
-version: 3.2.8 # This must match the version in lib/generator_tools.dart
+version: 3.2.9 # This must match the version in lib/generator_tools.dart
environment:
sdk: ">=2.12.0 <3.0.0"
diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md
index b70a2bc..3fcfe56 100644
--- a/packages/web_benchmarks/CHANGELOG.md
+++ b/packages/web_benchmarks/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.7+1
+
+* Updates text theme parameters to avoid deprecation issues.
+
## 0.0.7
* Updates BlinkTraceEvents to match with changes in Chromium v89+
diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml
index 8646078..c613091 100644
--- a/packages/web_benchmarks/pubspec.yaml
+++ b/packages/web_benchmarks/pubspec.yaml
@@ -2,7 +2,7 @@
description: A benchmark harness for performance-testing Flutter apps in Chrome.
repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
-version: 0.0.7
+version: 0.0.7+1
environment:
sdk: ">=2.7.0 <3.0.0"
diff --git a/packages/web_benchmarks/testing/test_app/lib/aboutpage.dart b/packages/web_benchmarks/testing/test_app/lib/aboutpage.dart
index a84561d..ac3507e 100644
--- a/packages/web_benchmarks/testing/test_app/lib/aboutpage.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/aboutpage.dart
@@ -21,7 +21,7 @@
body: Center(
child: Text(
'This is a sample app.',
- style: Theme.of(context).textTheme.headline3,
+ style: Theme.of(context).textTheme.displaySmall,
),
),
);
diff --git a/packages/web_benchmarks/testing/test_app/lib/homepage.dart b/packages/web_benchmarks/testing/test_app/lib/homepage.dart
index 9fee043..c065429 100644
--- a/packages/web_benchmarks/testing/test_app/lib/homepage.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/homepage.dart
@@ -50,7 +50,7 @@
const Text('You have pushed the button this many times:'),
Text(
'$_counter',
- style: Theme.of(context).textTheme.headline4,
+ style: Theme.of(context).textTheme.headlineMedium,
),
],
);
@@ -67,7 +67,7 @@
children: <Widget>[
Text(
'Line $index',
- style: Theme.of(context).textTheme.headline5,
+ style: Theme.of(context).textTheme.headlineSmall,
),
Expanded(child: Container()),
const Icon(Icons.camera),
