Skip to content

Commit ed004de

Browse files
author
Shi-Hao Hong
authored
[animmations] Remove all TODOs upon new Flutter stable release (#151)
1 parent e58fd11 commit ed004de

File tree

4 files changed

+8
-35
lines changed

4 files changed

+8
-35
lines changed

packages/animations/example/lib/container_transition.dart

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,7 @@ class _ExampleCard extends StatelessWidget {
313313
'adipiscing elit, sed do eiusmod tempor.',
314314
style: Theme.of(context)
315315
.textTheme
316-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
317-
// Material text style nomenclature.
318-
// ignore: deprecated_member_use
319-
.body1
316+
.bodyText2
320317
.copyWith(color: Colors.black54),
321318
),
322319
),
@@ -362,10 +359,7 @@ class _SmallerCard extends StatelessWidget {
362359
children: <Widget>[
363360
Text(
364361
'Title',
365-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
366-
// Material text style nomenclature.
367-
// ignore: deprecated_member_use
368-
style: Theme.of(context).textTheme.title,
362+
style: Theme.of(context).textTheme.headline6,
369363
),
370364
const SizedBox(height: 4),
371365
Text(
@@ -415,10 +409,7 @@ class _ExampleSingleTile extends StatelessWidget {
415409
children: <Widget>[
416410
Text(
417411
'Title',
418-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
419-
// Material text style nomenclature.
420-
// ignore: deprecated_member_use
421-
style: Theme.of(context).textTheme.subhead,
412+
style: Theme.of(context).textTheme.subtitle1,
422413
),
423414
const SizedBox(height: 8),
424415
Text(
@@ -485,21 +476,15 @@ class _DetailsPage extends StatelessWidget {
485476
children: <Widget>[
486477
Text(
487478
'Title',
488-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
489-
// Material text style nomenclature.
490-
// ignore: deprecated_member_use
491-
style: Theme.of(context).textTheme.headline.copyWith(
479+
style: Theme.of(context).textTheme.headline5.copyWith(
492480
color: Colors.black54,
493481
fontSize: 30.0,
494482
),
495483
),
496484
const SizedBox(height: 10),
497485
Text(
498486
_loremIpsumParagraph,
499-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
500-
// Material text style nomenclature.
501-
// ignore: deprecated_member_use
502-
style: Theme.of(context).textTheme.body1.copyWith(
487+
style: Theme.of(context).textTheme.bodyText2.copyWith(
503488
color: Colors.black54,
504489
height: 1.5,
505490
fontSize: 16.0,

packages/animations/example/lib/fade_through_transition.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,7 @@ class _ExampleCard extends StatelessWidget {
9393
children: <Widget>[
9494
Text(
9595
'123 photos',
96-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
97-
// Material text style nomenclature.
98-
// ignore: deprecated_member_use
99-
style: Theme.of(context).textTheme.body2,
96+
style: Theme.of(context).textTheme.bodyText1,
10097
),
10198
Text(
10299
'123 photos',

packages/animations/example/lib/shared_axis_transition.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,7 @@ class _CoursePage extends StatelessWidget {
122122
const Padding(padding: EdgeInsets.symmetric(vertical: 8.0)),
123123
Text(
124124
'Streamling your courses',
125-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
126-
// Material text style nomenclature.
127-
// ignore: deprecated_member_use
128-
style: Theme.of(context).textTheme.headline,
125+
style: Theme.of(context).textTheme.headline5,
129126
textAlign: TextAlign.center,
130127
),
131128
const Padding(padding: EdgeInsets.symmetric(vertical: 5.0)),
@@ -197,10 +194,7 @@ class _SignInPage extends StatelessWidget {
197194
Padding(padding: EdgeInsets.symmetric(vertical: maxHeight / 50)),
198195
Text(
199196
'Hi David Park',
200-
// TODO(shihaohong): Remove this once Flutter stable adopts the modern
201-
// Material text style nomenclature.
202-
// ignore: deprecated_member_use
203-
style: Theme.of(context).textTheme.headline,
197+
style: Theme.of(context).textTheme.headline5,
204198
),
205199
Padding(padding: EdgeInsets.symmetric(vertical: maxHeight / 50)),
206200
const Text(

packages/animations/lib/src/modal.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@ class _ModalRoute<T> extends PopupRoute<T> {
109109
@override
110110
final Duration transitionDuration;
111111

112-
// TODO(shihaohong): Remove the override analyzer ignore once
113-
// Flutter stable contains https://github.com/flutter/flutter/pull/48274.
114112
@override
115-
// ignore: override_on_non_overriding_member
116113
final Duration reverseTransitionDuration;
117114

118115
/// The primary contents of the modal.

0 commit comments

Comments
 (0)