Skip to content

Commit 06c3c93

Browse files
const AnimationStyle (flutter#160564)
[**AnimationStyle**](https://main-api.flutter.dev/flutter/animation/AnimationStyle-class.html) is an [`@immutable`](https://main-api.flutter.dev/flutter/meta/immutable-constant.html) class with all `final` fields. This pull request gives it a `const` constructor. <br> related: flutter#160563
1 parent 30f4fec commit 06c3c93

25 files changed

+117
-114
lines changed

examples/api/lib/material/app/app.0.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ class _MaterialAppExampleState extends State<MaterialAppExample> {
5151
case AnimationStyles.defaultStyle:
5252
_animationStyle = null;
5353
case AnimationStyles.custom:
54-
_animationStyle = AnimationStyle(
54+
_animationStyle = const AnimationStyle(
5555
curve: Easing.emphasizedAccelerate,
56-
duration: const Duration(seconds: 1),
56+
duration: Duration(seconds: 1),
5757
);
5858
case AnimationStyles.none:
5959
_animationStyle = AnimationStyle.noAnimation;

examples/api/lib/material/bottom_sheet/show_bottom_sheet.0.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ class _BottomSheetExampleState extends State<BottomSheetExample> {
5353
setState(() {
5454
_animationStyle = switch (styles.first) {
5555
AnimationStyles.defaultStyle => null,
56-
AnimationStyles.custom => AnimationStyle(
57-
duration: const Duration(seconds: 3),
58-
reverseDuration: const Duration(seconds: 1),
56+
AnimationStyles.custom => const AnimationStyle(
57+
duration: Duration(seconds: 3),
58+
reverseDuration: Duration(seconds: 1),
5959
),
6060
AnimationStyles.none => AnimationStyle.noAnimation,
6161
};

examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.2.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ class _ModalBottomSheetExampleState extends State<ModalBottomSheetExample> {
5353
setState(() {
5454
_animationStyle = switch (styles.first) {
5555
AnimationStyles.defaultStyle => null,
56-
AnimationStyles.custom => AnimationStyle(
57-
duration: const Duration(seconds: 3),
58-
reverseDuration: const Duration(seconds: 1),
56+
AnimationStyles.custom => const AnimationStyle(
57+
duration: Duration(seconds: 3),
58+
reverseDuration: Duration(seconds: 1),
5959
),
6060
AnimationStyles.none => AnimationStyle.noAnimation,
6161
};

examples/api/lib/material/chip/chip_attributes.chip_animation_style.0.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class _ChipAnimationStyleExampleState extends State<ChipAnimationStyleExample> {
4343
children: <Widget>[
4444
FilterChip.elevated(
4545
chipAnimationStyle: ChipAnimationStyle(
46-
enableAnimation: AnimationStyle(
47-
duration: const Duration(seconds: 3),
48-
reverseDuration: const Duration(seconds: 1),
46+
enableAnimation: const AnimationStyle(
47+
duration: Duration(seconds: 3),
48+
reverseDuration: Duration(seconds: 1),
4949
),
5050
),
5151
onSelected: !enabled ? null : (bool value) {},
@@ -69,9 +69,9 @@ class _ChipAnimationStyleExampleState extends State<ChipAnimationStyleExample> {
6969
children: <Widget>[
7070
FilterChip.elevated(
7171
chipAnimationStyle: ChipAnimationStyle(
72-
selectAnimation: AnimationStyle(
73-
duration: const Duration(seconds: 3),
74-
reverseDuration: const Duration(seconds: 1),
72+
selectAnimation: const AnimationStyle(
73+
duration: Duration(seconds: 3),
74+
reverseDuration: Duration(seconds: 1),
7575
),
7676
),
7777
backgroundColor: Colors.amber,
@@ -102,9 +102,9 @@ class _ChipAnimationStyleExampleState extends State<ChipAnimationStyleExample> {
102102
children: <Widget>[
103103
FilterChip.elevated(
104104
chipAnimationStyle: ChipAnimationStyle(
105-
avatarDrawerAnimation: AnimationStyle(
106-
duration: const Duration(seconds: 2),
107-
reverseDuration: const Duration(seconds: 1),
105+
avatarDrawerAnimation: const AnimationStyle(
106+
duration: Duration(seconds: 2),
107+
reverseDuration: Duration(seconds: 1),
108108
),
109109
),
110110
selected: showCheckmark,
@@ -127,9 +127,9 @@ class _ChipAnimationStyleExampleState extends State<ChipAnimationStyleExample> {
127127
children: <Widget>[
128128
FilterChip.elevated(
129129
chipAnimationStyle: ChipAnimationStyle(
130-
deleteDrawerAnimation: AnimationStyle(
131-
duration: const Duration(seconds: 2),
132-
reverseDuration: const Duration(seconds: 1),
130+
deleteDrawerAnimation: const AnimationStyle(
131+
duration: Duration(seconds: 2),
132+
reverseDuration: Duration(seconds: 1),
133133
),
134134
),
135135
onDeleted: showDeleteIcon ? () {} : null,

examples/api/lib/material/expansion_tile/expansion_tile.2.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class _ExpansionTileAnimationStyleAppState extends State<ExpansionTileAnimationS
4646
case AnimationStyles.defaultStyle:
4747
_animationStyle = null;
4848
case AnimationStyles.custom:
49-
_animationStyle = AnimationStyle(
49+
_animationStyle = const AnimationStyle(
5050
curve: Easing.emphasizedAccelerate,
5151
duration: Durations.extralong1,
5252
);

examples/api/lib/material/popup_menu/popup_menu.2.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ class _PopupMenuExampleState extends State<PopupMenuExample> {
5959
case AnimationStyles.defaultStyle:
6060
_animationStyle = null;
6161
case AnimationStyles.custom:
62-
_animationStyle = AnimationStyle(
62+
_animationStyle = const AnimationStyle(
6363
curve: Easing.emphasizedDecelerate,
64-
duration: const Duration(seconds: 3),
64+
duration: Duration(seconds: 3),
6565
);
6666
case AnimationStyles.none:
6767
_animationStyle = AnimationStyle.noAnimation;

examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.2.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class _SnackBarExampleState extends State<SnackBarExample> {
5050
setState(() {
5151
_animationStyle = switch (styles.first) {
5252
AnimationStyles.defaultStyle => null,
53-
AnimationStyles.custom => AnimationStyle(
54-
duration: const Duration(seconds: 3),
55-
reverseDuration: const Duration(seconds: 1),
53+
AnimationStyles.custom => const AnimationStyle(
54+
duration: Duration(seconds: 3),
55+
reverseDuration: Duration(seconds: 1),
5656
),
5757
AnimationStyles.none => AnimationStyle.noAnimation,
5858
};

examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.1.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ class _ShowBottomSheetExampleState extends State<ShowBottomSheetExample> {
5353
setState(() {
5454
_animationStyle = switch (styles.first) {
5555
AnimationStyles.defaultStyle => null,
56-
AnimationStyles.custom => AnimationStyle(
57-
duration: const Duration(seconds: 3),
58-
reverseDuration: const Duration(seconds: 1),
56+
AnimationStyles.custom => const AnimationStyle(
57+
duration: Duration(seconds: 3),
58+
reverseDuration: Duration(seconds: 1),
5959
),
6060
AnimationStyles.none => AnimationStyle.noAnimation,
6161
};

packages/flutter/lib/src/animation/animation_style.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import 'tween.dart';
2828
@immutable
2929
class AnimationStyle with Diagnosticable {
3030
/// Creates an instance of Animation Style class.
31-
AnimationStyle({this.curve, this.duration, this.reverseCurve, this.reverseDuration});
31+
const AnimationStyle({this.curve, this.duration, this.reverseCurve, this.reverseDuration});
3232

3333
/// Creates an instance of Animation Style class with no animation.
34-
static AnimationStyle noAnimation = AnimationStyle(
34+
static const AnimationStyle noAnimation = AnimationStyle(
3535
duration: Duration.zero,
3636
reverseDuration: Duration.zero,
3737
);

packages/flutter/lib/src/widgets/sliver_tree.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ class TreeSliver<T> extends StatefulWidget {
490490

491491
/// The default [AnimationStyle] used for node expand and collapse animations,
492492
/// when one has not been provided in [toggleAnimationStyle].
493-
static AnimationStyle defaultToggleAnimationStyle = AnimationStyle(
493+
static AnimationStyle defaultToggleAnimationStyle = const AnimationStyle(
494494
curve: defaultAnimationCurve,
495495
duration: defaultAnimationDuration,
496496
);

0 commit comments

Comments
 (0)