use const instead of final with const declarations (#14253)
diff --git a/dev/tools/vitool/lib/vitool.dart b/dev/tools/vitool/lib/vitool.dart index 7134382..22bb562 100644 --- a/dev/tools/vitool/lib/vitool.dart +++ b/dev/tools/vitool/lib/vitool.dart
@@ -292,7 +292,7 @@ final List<SvgPathCommand> commands; final double opacity; - static final String _pathCommandAtom = ' *([a-zA-Z]) *([\-\.0-9 ,]*)'; + static const String _pathCommandAtom = ' *([a-zA-Z]) *([\-\.0-9 ,]*)'; static final RegExp _pathCommandValidator = new RegExp('^($_pathCommandAtom)*\$'); static final RegExp _pathCommandMatcher = new RegExp(_pathCommandAtom); @@ -460,7 +460,7 @@ } -final String _transformCommandAtom = ' *([^(]+)\\(([^)]*)\\)'; +const String _transformCommandAtom = ' *([^(]+)\\(([^)]*)\\)'; final RegExp _transformValidator = new RegExp('^($_transformCommandAtom)*\$'); final RegExp _transformCommand = new RegExp(_transformCommandAtom);
diff --git a/examples/flutter_gallery/lib/demo/material/cards_demo.dart b/examples/flutter_gallery/lib/demo/material/cards_demo.dart index fbf0179..34218d1 100644 --- a/examples/flutter_gallery/lib/demo/material/cards_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
@@ -51,7 +51,7 @@ : assert(destination != null && destination.isValid), super(key: key); - static final double height = 366.0; + static const double height = 366.0; final TravelDestination destination; @override
diff --git a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart index c048981..fab2c95 100644 --- a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
@@ -94,7 +94,7 @@ class _CardDataItem extends StatelessWidget { const _CardDataItem({ this.page, this.data }); - static final double height = 272.0; + static const double height = 272.0; final _Page page; final _CardData data;
diff --git a/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart b/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart index 484ce48..42ca737 100644 --- a/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart +++ b/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart
@@ -200,11 +200,11 @@ class _HeadingLayout extends MultiChildLayoutDelegate { _HeadingLayout(); - static final String price = 'price'; - static final String image = 'image'; - static final String title = 'title'; - static final String description = 'description'; - static final String vendor = 'vendor'; + static const String price = 'price'; + static const String image = 'image'; + static const String title = 'title'; + static const String description = 'description'; + static const String vendor = 'vendor'; @override void performLayout(Size size) {
diff --git a/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart b/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart index aede511..9517a51 100644 --- a/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart +++ b/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart
@@ -101,10 +101,10 @@ class _HeadingLayout extends MultiChildLayoutDelegate { _HeadingLayout(); - static final String image = 'image'; - static final String icon = 'icon'; - static final String product = 'product'; - static final String vendor = 'vendor'; + static const String image = 'image'; + static const String icon = 'icon'; + static const String product = 'product'; + static const String vendor = 'vendor'; @override void performLayout(Size size) {
diff --git a/examples/flutter_gallery/test_driver/transitions_perf_test.dart b/examples/flutter_gallery/test_driver/transitions_perf_test.dart index 7688487..451fc37 100644 --- a/examples/flutter_gallery/test_driver/transitions_perf_test.dart +++ b/examples/flutter_gallery/test_driver/transitions_perf_test.dart
@@ -82,7 +82,7 @@ const Demo('Typography'), ]; -final FileSystem _fs = const LocalFileSystem(); +const FileSystem _fs = const LocalFileSystem(); const Duration kWaitBetweenActions = const Duration(milliseconds: 250);
diff --git a/examples/layers/widgets/styled_text.dart b/examples/layers/widgets/styled_text.dart index c550881..bcb002c 100644 --- a/examples/layers/widgets/styled_text.dart +++ b/examples/layers/widgets/styled_text.dart
@@ -25,8 +25,8 @@ final TextStyle _kDaveStyle = new TextStyle(color: Colors.indigo.shade400, height: 1.8); final TextStyle _kHalStyle = new TextStyle(color: Colors.red.shade400, fontFamily: 'monospace'); -final TextStyle _kBold = const TextStyle(fontWeight: FontWeight.bold); -final TextStyle _kUnderline = const TextStyle( +const TextStyle _kBold = const TextStyle(fontWeight: FontWeight.bold); +const TextStyle _kUnderline = const TextStyle( decoration: TextDecoration.underline, decorationColor: const Color(0xFF000000), decorationStyle: TextDecorationStyle.wavy
diff --git a/packages/flutter/lib/src/cupertino/slider.dart b/packages/flutter/lib/src/cupertino/slider.dart index c2b2fc7..4484536 100644 --- a/packages/flutter/lib/src/cupertino/slider.dart +++ b/packages/flutter/lib/src/cupertino/slider.dart
@@ -182,7 +182,7 @@ const Color _kTrackColor = const Color(0xFFB5B5B5); const double _kSliderHeight = 2.0 * (CupertinoThumbPainter.radius + _kPadding); const double _kSliderWidth = 176.0; // Matches Material Design slider. -final Duration _kDiscreteTransitionDuration = const Duration(milliseconds: 500); +const Duration _kDiscreteTransitionDuration = const Duration(milliseconds: 500); const double _kAdjustmentUnit = 0.1; // Matches iOS implementation of material slider.
diff --git a/packages/flutter/lib/src/material/slider.dart b/packages/flutter/lib/src/material/slider.dart index b4cfd2a..8b11c61 100644 --- a/packages/flutter/lib/src/material/slider.dart +++ b/packages/flutter/lib/src/material/slider.dart
@@ -289,7 +289,7 @@ final Tween<double> _kReactionRadiusTween = new Tween<double>(begin: _kThumbRadius, end: _kReactionRadius); final Tween<double> _kThumbRadiusTween = new Tween<double>(begin: _kThumbRadius, end: _kActiveThumbRadius); final ColorTween _kTickColorTween = new ColorTween(begin: Colors.transparent, end: Colors.black54); -final Duration _kDiscreteTransitionDuration = const Duration(milliseconds: 500); +const Duration _kDiscreteTransitionDuration = const Duration(milliseconds: 500); const double _kLabelBalloonRadius = 14.0; final Tween<double> _kLabelBalloonCenterTween = new Tween<double>(begin: 0.0, end: -_kLabelBalloonRadius * 2.0);
diff --git a/packages/flutter/lib/src/material/user_accounts_drawer_header.dart b/packages/flutter/lib/src/material/user_accounts_drawer_header.dart index 58bb168..a2c1347 100644 --- a/packages/flutter/lib/src/material/user_accounts_drawer_header.dart +++ b/packages/flutter/lib/src/material/user_accounts_drawer_header.dart
@@ -165,9 +165,9 @@ _AccountDetailsLayout({ @required this.textDirection }); - static final String accountName = 'accountName'; - static final String accountEmail = 'accountEmail'; - static final String dropdownIcon = 'dropdownIcon'; + static const String accountName = 'accountName'; + static const String accountEmail = 'accountEmail'; + static const String dropdownIcon = 'dropdownIcon'; final TextDirection textDirection;
diff --git a/packages/flutter/lib/src/rendering/stack.dart b/packages/flutter/lib/src/rendering/stack.dart index a7798b7..6e9b108 100644 --- a/packages/flutter/lib/src/rendering/stack.dart +++ b/packages/flutter/lib/src/rendering/stack.dart
@@ -55,7 +55,7 @@ } /// A rect that covers the entire container. - static final RelativeRect fill = const RelativeRect.fromLTRB(0.0, 0.0, 0.0, 0.0); + static const RelativeRect fill = const RelativeRect.fromLTRB(0.0, 0.0, 0.0, 0.0); /// Distance from the left side of the container to the left side of this rectangle. ///
diff --git a/packages/flutter/lib/src/widgets/widget_inspector.dart b/packages/flutter/lib/src/widgets/widget_inspector.dart index c400ea0..771fcc7 100644 --- a/packages/flutter/lib/src/widgets/widget_inspector.dart +++ b/packages/flutter/lib/src/widgets/widget_inspector.dart
@@ -843,10 +843,10 @@ int get hashCode => hashValues(overlayRect, selected, hashList(candidates), tooltip); } -final int _kMaxTooltipLines = 5; -final Color _kTooltipBackgroundColor = const Color.fromARGB(230, 60, 60, 60); -final Color _kHighlightedRenderObjectFillColor = const Color.fromARGB(128, 128, 128, 255); -final Color _kHighlightedRenderObjectBorderColor = const Color.fromARGB(128, 64, 64, 128); +const int _kMaxTooltipLines = 5; +const Color _kTooltipBackgroundColor = const Color.fromARGB(230, 60, 60, 60); +const Color _kHighlightedRenderObjectFillColor = const Color.fromARGB(128, 128, 128, 255); +const Color _kHighlightedRenderObjectBorderColor = const Color.fromARGB(128, 64, 64, 128); /// A layer that outlines the selected [RenderObject] and candidate render /// objects that also match the last pointer location.
diff --git a/packages/flutter/test/widgets/list_view_misc_test.dart b/packages/flutter/test/widgets/list_view_misc_test.dart index 5818e88..85b15f8 100644 --- a/packages/flutter/test/widgets/list_view_misc_test.dart +++ b/packages/flutter/test/widgets/list_view_misc_test.dart
@@ -6,7 +6,7 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -final Key blockKey = const Key('test'); +const Key blockKey = const Key('test'); void main() { testWidgets('Cannot scroll a non-overflowing block', (WidgetTester tester) async {
diff --git a/packages/flutter/test/widgets/multichild_test.dart b/packages/flutter/test/widgets/multichild_test.dart index 343398b..65a1f51 100644 --- a/packages/flutter/test/widgets/multichild_test.dart +++ b/packages/flutter/test/widgets/multichild_test.dart
@@ -37,10 +37,10 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), - new DecoratedBox(decoration: kBoxDecorationB), - new DecoratedBox(decoration: kBoxDecorationC), + children: const <Widget>[ + const DecoratedBox(decoration: kBoxDecorationA), + const DecoratedBox(decoration: kBoxDecorationB), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -50,9 +50,9 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), - new DecoratedBox(decoration: kBoxDecorationC), + children: const <Widget>[ + const DecoratedBox(decoration: kBoxDecorationA), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -62,10 +62,10 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), - new DecoratedBox(key: const Key('b'), decoration: kBoxDecorationB), - new DecoratedBox(decoration: kBoxDecorationC), + children: const <Widget>[ + const DecoratedBox(decoration: kBoxDecorationA), + const DecoratedBox(key: const Key('b'), decoration: kBoxDecorationB), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -75,10 +75,10 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(key: const Key('b'), decoration: kBoxDecorationB), - new DecoratedBox(decoration: kBoxDecorationC), - new DecoratedBox(key: const Key('a'), decoration: kBoxDecorationA), + children: const <Widget>[ + const DecoratedBox(key: const Key('b'), decoration: kBoxDecorationB), + const DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(key: const Key('a'), decoration: kBoxDecorationA), ], ), ); @@ -88,10 +88,10 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(key: const Key('a'), decoration: kBoxDecorationA), - new DecoratedBox(decoration: kBoxDecorationC), - new DecoratedBox(key: const Key('b'), decoration: kBoxDecorationB), + children: const <Widget>[ + const DecoratedBox(key: const Key('a'), decoration: kBoxDecorationA), + const DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(key: const Key('b'), decoration: kBoxDecorationB), ], ), ); @@ -101,8 +101,8 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationC), + children: const <Widget>[ + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -122,10 +122,10 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), - new DecoratedBox(decoration: kBoxDecorationB), - new DecoratedBox(decoration: kBoxDecorationC), + children: const <Widget>[ + const DecoratedBox(decoration: kBoxDecorationA), + const DecoratedBox(decoration: kBoxDecorationB), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -136,11 +136,11 @@ new Stack( textDirection: TextDirection.ltr, children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), + const DecoratedBox(decoration: kBoxDecorationA), new Container( - child: new DecoratedBox(decoration: kBoxDecorationB) + child: const DecoratedBox(decoration: kBoxDecorationB) ), - new DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -151,13 +151,13 @@ new Stack( textDirection: TextDirection.ltr, children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), + const DecoratedBox(decoration: kBoxDecorationA), new Container( child: new Container( - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), ), - new DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -170,13 +170,13 @@ children: <Widget>[ new Container( child: new Container( - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), ), new Container( - child: new DecoratedBox(decoration: kBoxDecorationA), + child: const DecoratedBox(decoration: kBoxDecorationA), ), - new DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -188,12 +188,12 @@ textDirection: TextDirection.ltr, children: <Widget>[ new Container( - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), new Container( - child: new DecoratedBox(decoration: kBoxDecorationA), + child: const DecoratedBox(decoration: kBoxDecorationA), ), - new DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -206,11 +206,11 @@ children: <Widget>[ new Container( key: const Key('b'), - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), new Container( key: const Key('a'), - child: new DecoratedBox(decoration: kBoxDecorationA), + child: const DecoratedBox(decoration: kBoxDecorationA), ), ], ), @@ -224,11 +224,11 @@ children: <Widget>[ new Container( key: const Key('a'), - child: new DecoratedBox(decoration: kBoxDecorationA), + child: const DecoratedBox(decoration: kBoxDecorationA), ), new Container( key: const Key('b'), - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), ], ), @@ -247,9 +247,9 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), - new DecoratedBox(decoration: kBoxDecorationB), + children: const <Widget>[ + const DecoratedBox(decoration: kBoxDecorationA), + const DecoratedBox(decoration: kBoxDecorationB), ], ), ); @@ -259,12 +259,12 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new FlipWidget( - left: new DecoratedBox(decoration: kBoxDecorationA), - right: new DecoratedBox(decoration: kBoxDecorationB), + children: const <Widget>[ + const FlipWidget( + left: const DecoratedBox(decoration: kBoxDecorationA), + right: const DecoratedBox(decoration: kBoxDecorationB), ), - new DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -279,10 +279,10 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new FlipWidget( - left: new DecoratedBox(decoration: kBoxDecorationA), - right: new DecoratedBox(decoration: kBoxDecorationB), + children: const <Widget>[ + const FlipWidget( + left: const DecoratedBox(decoration: kBoxDecorationA), + right: const DecoratedBox(decoration: kBoxDecorationB), ), ], ), @@ -298,11 +298,11 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new FlipWidget( + children: const <Widget>[ + const FlipWidget( key: const Key('flip'), - left: new DecoratedBox(decoration: kBoxDecorationA), - right: new DecoratedBox(decoration: kBoxDecorationB), + left: const DecoratedBox(decoration: kBoxDecorationA), + right: const DecoratedBox(decoration: kBoxDecorationB), ), ], ), @@ -311,12 +311,12 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(key: const Key('c'), decoration: kBoxDecorationC), - new FlipWidget( + children: const <Widget>[ + const DecoratedBox(key: const Key('c'), decoration: kBoxDecorationC), + const FlipWidget( key: const Key('flip'), - left: new DecoratedBox(decoration: kBoxDecorationA), - right: new DecoratedBox(decoration: kBoxDecorationB), + left: const DecoratedBox(decoration: kBoxDecorationA), + right: const DecoratedBox(decoration: kBoxDecorationB), ), ], ), @@ -332,13 +332,13 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new FlipWidget( + children: const <Widget>[ + const FlipWidget( key: const Key('flip'), - left: new DecoratedBox(decoration: kBoxDecorationA), - right: new DecoratedBox(decoration: kBoxDecorationB), + left: const DecoratedBox(decoration: kBoxDecorationA), + right: const DecoratedBox(decoration: kBoxDecorationB), ), - new DecoratedBox(key: const Key('c'), decoration: kBoxDecorationC), + const DecoratedBox(key: const Key('c'), decoration: kBoxDecorationC), ], ), );
diff --git a/packages/flutter/test/widgets/parent_data_test.dart b/packages/flutter/test/widgets/parent_data_test.dart index c28fe85..c5cec27 100644 --- a/packages/flutter/test/widgets/parent_data_test.dart +++ b/packages/flutter/test/widgets/parent_data_test.dart
@@ -53,14 +53,14 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new DecoratedBox(decoration: kBoxDecorationA), - new Positioned( + children: const <Widget>[ + const DecoratedBox(decoration: kBoxDecorationA), + const Positioned( top: 10.0, left: 10.0, - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), - new DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -74,18 +74,18 @@ await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: <Widget>[ - new Positioned( + children: const <Widget>[ + const Positioned( bottom: 5.0, right: 7.0, - child: new DecoratedBox(decoration: kBoxDecorationA), + child: const DecoratedBox(decoration: kBoxDecorationA), ), - new Positioned( + const Positioned( top: 10.0, left: 10.0, - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), - new DecoratedBox(decoration: kBoxDecorationC), + const DecoratedBox(decoration: kBoxDecorationC), ], ), ); @@ -96,9 +96,9 @@ kNonPositioned, ]); - final DecoratedBox kDecoratedBoxA = new DecoratedBox(decoration: kBoxDecorationA); - final DecoratedBox kDecoratedBoxB = new DecoratedBox(decoration: kBoxDecorationB); - final DecoratedBox kDecoratedBoxC = new DecoratedBox(decoration: kBoxDecorationC); + final DecoratedBox kDecoratedBoxA = const DecoratedBox(decoration: kBoxDecorationA); + final DecoratedBox kDecoratedBoxB = const DecoratedBox(decoration: kBoxDecorationB); + final DecoratedBox kDecoratedBoxC = const DecoratedBox(decoration: kBoxDecorationC); await tester.pumpWidget( new Stack( @@ -254,13 +254,13 @@ new Stack( textDirection: TextDirection.ltr, children: <Widget>[ - new Positioned( + const Positioned( top: 5.0, bottom: 8.0, - child: new Positioned( + child: const Positioned( top: 6.0, left: 7.0, - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), ), ], @@ -276,10 +276,10 @@ new Container( child: new Row( children: <Widget>[ - new Positioned( + const Positioned( top: 6.0, left: 7.0, - child: new DecoratedBox(decoration: kBoxDecorationB), + child: const DecoratedBox(decoration: kBoxDecorationB), ), ], ),
diff --git a/packages/flutter/test/widgets/stateful_component_test.dart b/packages/flutter/test/widgets/stateful_component_test.dart index 45a5f4d..fb82a1e 100644 --- a/packages/flutter/test/widgets/stateful_component_test.dart +++ b/packages/flutter/test/widgets/stateful_component_test.dart
@@ -22,18 +22,18 @@ } await tester.pumpWidget( - new FlipWidget( - left: new DecoratedBox(decoration: kBoxDecorationA), - right: new DecoratedBox(decoration: kBoxDecorationB) + const FlipWidget( + left: const DecoratedBox(decoration: kBoxDecorationA), + right: const DecoratedBox(decoration: kBoxDecorationB) ) ); checkTree(kBoxDecorationA); await tester.pumpWidget( - new FlipWidget( - left: new DecoratedBox(decoration: kBoxDecorationB), - right: new DecoratedBox(decoration: kBoxDecorationA) + const FlipWidget( + left: const DecoratedBox(decoration: kBoxDecorationB), + right: const DecoratedBox(decoration: kBoxDecorationA) ) ); @@ -46,9 +46,9 @@ checkTree(kBoxDecorationA); await tester.pumpWidget( - new FlipWidget( - left: new DecoratedBox(decoration: kBoxDecorationA), - right: new DecoratedBox(decoration: kBoxDecorationB) + const FlipWidget( + left: const DecoratedBox(decoration: kBoxDecorationA), + right: const DecoratedBox(decoration: kBoxDecorationB) ) ); @@ -60,7 +60,7 @@ new FlipWidget( key: const Key('rebuild test'), left: new TestBuildCounter(), - right: new DecoratedBox(decoration: kBoxDecorationB) + right: const DecoratedBox(decoration: kBoxDecorationB) ) );
diff --git a/packages/flutter/test/widgets/test_widgets.dart b/packages/flutter/test/widgets/test_widgets.dart index fd2498e..e0b8356 100644 --- a/packages/flutter/test/widgets/test_widgets.dart +++ b/packages/flutter/test/widgets/test_widgets.dart
@@ -6,15 +6,15 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -final BoxDecoration kBoxDecorationA = const BoxDecoration( +const BoxDecoration kBoxDecorationA = const BoxDecoration( color: const Color(0xFFFF0000), ); -final BoxDecoration kBoxDecorationB = const BoxDecoration( +const BoxDecoration kBoxDecorationB = const BoxDecoration( color: const Color(0xFF00FF00), ); -final BoxDecoration kBoxDecorationC = const BoxDecoration( +const BoxDecoration kBoxDecorationC = const BoxDecoration( color: const Color(0xFF0000FF), ); @@ -24,7 +24,7 @@ @override Widget build(BuildContext context) { buildCount += 1; - return new DecoratedBox(decoration: kBoxDecorationA); + return const DecoratedBox(decoration: kBoxDecorationA); } }
diff --git a/packages/flutter_driver/lib/src/driver/timeline_summary.dart b/packages/flutter_driver/lib/src/driver/timeline_summary.dart index 99a70c6..61d25cd 100644 --- a/packages/flutter_driver/lib/src/driver/timeline_summary.dart +++ b/packages/flutter_driver/lib/src/driver/timeline_summary.dart
@@ -12,7 +12,7 @@ import 'common.dart'; import 'timeline.dart'; -final JsonEncoder _prettyEncoder = const JsonEncoder.withIndent(' '); +const JsonEncoder _prettyEncoder = const JsonEncoder.withIndent(' '); /// The maximum amount of time considered safe to spend for a frame's build /// phase. Anything past that is in the danger of missing the frame as 60FPS.
diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart index 399a022..7244ae6 100644 --- a/packages/flutter_test/lib/src/binding.dart +++ b/packages/flutter_test/lib/src/binding.dart
@@ -279,7 +279,7 @@ fontSize: 40.0, ); - static final Widget _kPreTestMessage = const Center( + static const Widget _kPreTestMessage = const Center( child: const Text( 'Test starting...', style: _kMessageStyle, @@ -287,7 +287,7 @@ ) ); - static final Widget _kPostTestMessage = const Center( + static const Widget _kPostTestMessage = const Center( child: const Text( 'Test finished.', style: _kMessageStyle,
diff --git a/packages/flutter_test/lib/src/finders.dart b/packages/flutter_test/lib/src/finders.dart index 73f8f90..4343a5c 100644 --- a/packages/flutter_test/lib/src/finders.dart +++ b/packages/flutter_test/lib/src/finders.dart
@@ -15,7 +15,7 @@ typedef bool ElementPredicate(Element element); /// Some frequently used widget [Finder]s. -final CommonFinders find = const CommonFinders._(); +const CommonFinders find = const CommonFinders._(); /// Provides lightweight syntax for getting frequently used widget [Finder]s. ///
diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart index ad41013..14c0310 100644 --- a/packages/flutter_tools/lib/src/application_package.dart +++ b/packages/flutter_tools/lib/src/application_package.dart
@@ -200,7 +200,7 @@ } class BuildableIOSApp extends IOSApp { - static final String kBundleName = 'Runner.app'; + static const String kBundleName = 'Runner.app'; BuildableIOSApp({ this.appDirectory,
diff --git a/packages/flutter_tools/lib/src/ios/cocoapods.dart b/packages/flutter_tools/lib/src/ios/cocoapods.dart index 9ebe95a..da63cdc 100644 --- a/packages/flutter_tools/lib/src/ios/cocoapods.dart +++ b/packages/flutter_tools/lib/src/ios/cocoapods.dart
@@ -17,16 +17,16 @@ import '../cache.dart'; import '../globals.dart'; -final String noCocoaPodsConsequence = ''' +const String noCocoaPodsConsequence = ''' CocoaPods is used to retrieve the iOS platform side's plugin code that responds to your plugin usage on the Dart side. Without resolving iOS dependencies with CocoaPods, plugins will not work on iOS. For more info, see https://flutter.io/platform-plugins'''; -final String cocoaPodsInstallInstructions = ''' +const String cocoaPodsInstallInstructions = ''' brew install cocoapods pod setup'''; -final String cocoaPodsUpgradeInstructions = ''' +const String cocoaPodsUpgradeInstructions = ''' brew upgrade cocoapods pod setup''';
diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index bd2679c..a5c45aa 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -1025,7 +1025,7 @@ _updateHeaps(map['_heaps'], mapIsRef); } - static final int kIsolateReloadBarred = 1005; + static const int kIsolateReloadBarred = 1005; Future<Map<String, dynamic>> reloadSources( { bool pause: false,
diff --git a/packages/flutter_tools/test/application_package_test.dart b/packages/flutter_tools/test/application_package_test.dart index 41c8490..be5df05 100644 --- a/packages/flutter_tools/test/application_package_test.dart +++ b/packages/flutter_tools/test/application_package_test.dart
@@ -29,7 +29,7 @@ }); } -final String _aaptData = ''' +const String _aaptData = ''' package: name='io.flutter.gallery' versionCode='1' versionName='0.0.1' platformBuildVersionName='NMR1' sdkVersion:'14' targetSdkVersion:'21'