Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit b0f1714

Browse files
goderbauergoderbauer
authored
Make Flex,Row,Column const for real (#119673)
* Make Flex,Row,Column const for real * dart fix --apply * fix snippets * fix integration test * add comment
1 parent 3f986e4 commit b0f1714

File tree

107 files changed

+520
-515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+520
-515
lines changed

‎dev/automated_tests/flutter_test/print_correct_local_widget_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ void main() {
1414
appBar: AppBar(
1515
title: const Text('RenderFlex OverFlow'),
1616
),
17-
body: SizedBox(
17+
body: const SizedBox(
1818
width: 400.0,
1919
child: Row(
2020
children: <Widget>[
21-
const Icon(Icons.message),
21+
Icon(Icons.message),
2222
Column(
2323
mainAxisSize: MainAxisSize.min,
2424
crossAxisAlignment: CrossAxisAlignment.start,
25-
children: const <Widget>[
25+
children: <Widget>[
2626
Text('Title'),
2727
Text(
2828
'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed '

‎dev/benchmarks/complex_layout/lib/src/app.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,11 @@ class IconBar extends StatelessWidget {
279279

280280
@override
281281
Widget build(BuildContext context) {
282-
return Padding(
283-
padding: const EdgeInsets.only(left: 16.0, right: 16.0),
282+
return const Padding(
283+
padding: EdgeInsets.only(left: 16.0, right: 16.0),
284284
child: Row(
285285
mainAxisAlignment: MainAxisAlignment.spaceBetween,
286-
children: const <Widget>[
286+
children: <Widget>[
287287
IconWithText(Icons.thumb_up, 'Like'),
288288
IconWithText(Icons.comment, 'Comment'),
289289
IconWithText(Icons.share, 'Share'),
@@ -578,9 +578,9 @@ class BottomBar extends StatelessWidget {
578578
),
579579
),
580580
),
581-
child: Row(
581+
child: const Row(
582582
mainAxisAlignment: MainAxisAlignment.spaceBetween,
583-
children: const <Widget>[
583+
children: <Widget>[
584584
BottomBarButton(Icons.new_releases, 'News'),
585585
BottomBarButton(Icons.people, 'Requests'),
586586
BottomBarButton(Icons.chat, 'Messenger'),

‎dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ class CubicBezierPage extends StatelessWidget {
1212

1313
@override
1414
Widget build(BuildContext context) {
15-
return Center(
15+
return const Center(
1616
child: Column(
1717
mainAxisAlignment: MainAxisAlignment.center,
18-
children: const <Widget>[
18+
children: <Widget>[
1919
Bezier(Colors.amber, 1.0),
2020
],
2121
),

‎dev/benchmarks/macrobenchmarks/lib/src/stack_size.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ class StackSizePage extends StatelessWidget {
8888

8989
@override
9090
Widget build(BuildContext context) {
91-
return Material(
91+
return const Material(
9292
child: Column(
93-
children: const <Widget>[
93+
children: <Widget>[
9494
SizedBox(
9595
width: 200,
9696
height: 100,

‎dev/benchmarks/macrobenchmarks/lib/src/text.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ class TextPage extends StatelessWidget {
99

1010
@override
1111
Widget build(BuildContext context) {
12-
return Material(
12+
return const Material(
1313
child: Column(
1414
mainAxisAlignment: MainAxisAlignment.center,
15-
children: const <Widget>[
15+
children: <Widget>[
1616
SizedBox(
1717
width: 200,
1818
height: 100,

‎dev/benchmarks/macrobenchmarks/lib/src/web/bench_simple_lazy_text_scroll.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class BenchSimpleLazyTextScroll extends WidgetRecorder {
2020

2121
@override
2222
Widget createWidget() {
23-
return Directionality(
23+
return const Directionality(
2424
textDirection: TextDirection.ltr,
2525
child: Row(
26-
children: const <Widget>[
26+
children: <Widget>[
2727
Flexible(
2828
child: _TestScrollingWidget(
2929
initialScrollOffset: 0,

‎dev/benchmarks/microbenchmarks/lib/foundation/all_elements_bench.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Future<void> main() async {
2828
Icon(Icons.ac_unit),
2929
],
3030
),
31-
body: Column(
32-
children: const <Widget>[
31+
body: const Column(
32+
children: <Widget>[
3333
Text('Item 1'),
3434
Text('Item 2'),
3535
Text('Item 3'),

‎dev/benchmarks/test_apps/stocks/lib/stock_home.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ class _CreateCompanySheet extends StatelessWidget {
345345

346346
@override
347347
Widget build(BuildContext context) {
348-
return Column(
349-
children: const <Widget>[
348+
return const Column(
349+
children: <Widget>[
350350
TextField(
351351
autofocus: true,
352352
decoration: InputDecoration(

‎dev/integration_tests/abstract_method_smoke_test/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ class SecondPage extends StatelessWidget {
5959

6060
@override
6161
Widget build(BuildContext context) {
62-
return Scaffold(
62+
return const Scaffold(
6363
body: Column(
64-
children: const <Widget>[
64+
children: <Widget>[
6565
Expanded(
6666
child: AndroidView(viewType: 'simple')
6767
),

‎dev/integration_tests/flutter_gallery/lib/demo/cupertino/cupertino_switch_demo.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class _CupertinoSwitchDemoState extends State<CupertinoSwitchDemo> {
5757
),
5858
Semantics(
5959
container: true,
60-
child: Column(
61-
children: const <Widget>[
60+
child: const Column(
61+
children: <Widget>[
6262
CupertinoSwitch(
6363
value: true,
6464
onChanged: null,
@@ -71,8 +71,8 @@ class _CupertinoSwitchDemoState extends State<CupertinoSwitchDemo> {
7171
),
7272
Semantics(
7373
container: true,
74-
child: Column(
75-
children: const <Widget>[
74+
child: const Column(
75+
children: <Widget>[
7676
CupertinoSwitch(
7777
value: false,
7878
onChanged: null,

‎dev/integration_tests/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@ class _DemoDrawer extends StatelessWidget {
402402

403403
@override
404404
Widget build(BuildContext context) {
405-
return Drawer(
405+
return const Drawer(
406406
child: Column(
407-
children: const <Widget>[
407+
children: <Widget>[
408408
ListTile(
409409
leading: Icon(Icons.search),
410410
title: Text('Search'),

‎dev/integration_tests/flutter_gallery/lib/demo/material/search_demo.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ class _SearchDemoState extends State<SearchDemo> {
7070
child: Column(
7171
mainAxisAlignment: MainAxisAlignment.center,
7272
children: <Widget>[
73-
MergeSemantics(
73+
const MergeSemantics(
7474
child: Column(
7575
mainAxisAlignment: MainAxisAlignment.center,
7676
children: <Widget>[
7777
Row(
7878
mainAxisAlignment: MainAxisAlignment.center,
79-
children: const <Widget>[
79+
children: <Widget>[
8080
Text('Press the '),
8181
Tooltip(
8282
message: 'search',
@@ -88,7 +88,7 @@ class _SearchDemoState extends State<SearchDemo> {
8888
Text(' icon in the AppBar'),
8989
],
9090
),
91-
const Text('and search for an integer between 0 and 100,000.'),
91+
Text('and search for an integer between 0 and 100,000.'),
9292
],
9393
),
9494
),

‎dev/integration_tests/flutter_gallery/lib/demo/material/selection_controls_demo.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
126126
),
127127
],
128128
),
129-
Row(
129+
const Row(
130130
mainAxisSize: MainAxisSize.min,
131-
children: const <Widget>[
131+
children: <Widget>[
132132
// Disabled checkboxes
133133
Checkbox(value: true, onChanged: null),
134134
Checkbox(value: false, onChanged: null),
@@ -167,9 +167,9 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
167167
],
168168
),
169169
// Disabled radio buttons
170-
Row(
170+
const Row(
171171
mainAxisSize: MainAxisSize.min,
172-
children: const <Widget>[
172+
children: <Widget>[
173173
Radio<int>(
174174
value: 0,
175175
groupValue: 0,

‎dev/integration_tests/flutter_gallery/lib/demo/material/slider_demo.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ class _SlidersState extends State<_Sliders> {
296296
const Text('Continuous with Editable Numerical Value'),
297297
],
298298
),
299-
Column(
299+
const Column(
300300
mainAxisSize: MainAxisSize.min,
301-
children: const <Widget>[
301+
children: <Widget>[
302302
Slider.adaptive(value: 0.25, onChanged: null),
303303
Text('Disabled'),
304304
],

‎dev/integration_tests/flutter_gallery/lib/demo/transformations/transformations_demo.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ class _TransformationsDemoState extends State<TransformationsDemo> {
9393
Widget get instructionDialog {
9494
return AlertDialog(
9595
title: const Text('2D Transformations'),
96-
content: Column(
96+
content: const Column(
9797
crossAxisAlignment: CrossAxisAlignment.start,
9898
mainAxisSize: MainAxisSize.min,
99-
children: const <Widget>[
99+
children: <Widget>[
100100
Text('Tap to edit hex tiles, and use gestures to move around the scene:\n'),
101101
Text('- Drag to pan.'),
102102
Text('- Pinch to zoom.'),

‎dev/integration_tests/ui/lib/overflow.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class _TestState extends State<Test> {
2929
if (!_triggered) {
3030
return const SizedBox.shrink();
3131
}
32-
return Row(children: const <Widget>[
32+
return const Row(children: <Widget>[
3333
SizedBox(width: 10000.0),
3434
SizedBox(width: 10000.0),
3535
SizedBox(width: 10000.0),

‎dev/integration_tests/web/lib/service_worker_test_cached_resources.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import 'package:flutter/material.dart';
66

77
Future<void> main() async {
8-
runApp(Scaffold(
8+
runApp(const Scaffold(
99
body: Center(
1010
child: Column(
11-
children: const <Widget>[
11+
children: <Widget>[
1212
Icon(Icons.ac_unit),
1313
Text('Hello, World', textDirection: TextDirection.ltr),
1414
],

‎dev/manual_tests/lib/actions.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -432,25 +432,25 @@ class _FocusDemoState extends State<FocusDemo> {
432432
return Column(
433433
mainAxisAlignment: MainAxisAlignment.center,
434434
children: <Widget>[
435-
Row(
435+
const Row(
436436
mainAxisAlignment: MainAxisAlignment.center,
437-
children: const <Widget>[
437+
children: <Widget>[
438438
DemoButton(name: 'One'),
439439
DemoButton(name: 'Two'),
440440
DemoButton(name: 'Three'),
441441
],
442442
),
443-
Row(
443+
const Row(
444444
mainAxisAlignment: MainAxisAlignment.center,
445-
children: const <Widget>[
445+
children: <Widget>[
446446
DemoButton(name: 'Four'),
447447
DemoButton(name: 'Five'),
448448
DemoButton(name: 'Six'),
449449
],
450450
),
451-
Row(
451+
const Row(
452452
mainAxisAlignment: MainAxisAlignment.center,
453-
children: const <Widget>[
453+
children: <Widget>[
454454
DemoButton(name: 'Seven'),
455455
DemoButton(name: 'Eight'),
456456
DemoButton(name: 'Nine'),

‎dev/manual_tests/lib/drag_and_drop.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,9 @@ class DragAndDropAppState extends State<DragAndDropApp> {
270270
],
271271
),
272272
),
273-
Expanded(
273+
const Expanded(
274274
child: Row(
275-
children: const <Widget>[
275+
children: <Widget>[
276276
Expanded(child: ExampleDragTarget()),
277277
Expanded(child: ExampleDragTarget()),
278278
Expanded(child: ExampleDragTarget()),

‎dev/manual_tests/lib/focus.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,28 +152,28 @@ class _FocusDemoState extends State<FocusDemo> {
152152
return Column(
153153
mainAxisAlignment: MainAxisAlignment.center,
154154
children: <Widget>[
155-
Row(
155+
const Row(
156156
mainAxisAlignment: MainAxisAlignment.center,
157-
children: const <Widget>[
157+
children: <Widget>[
158158
DemoButton(
159159
name: 'One',
160160
autofocus: true,
161161
),
162162
],
163163
),
164-
Row(
164+
const Row(
165165
mainAxisAlignment: MainAxisAlignment.center,
166-
children: const <Widget>[
166+
children: <Widget>[
167167
DemoButton(name: 'Two'),
168168
DemoButton(
169169
name: 'Three',
170170
canRequestFocus: false,
171171
),
172172
],
173173
),
174-
Row(
174+
const Row(
175175
mainAxisAlignment: MainAxisAlignment.center,
176-
children: const <Widget>[
176+
children: <Widget>[
177177
DemoButton(name: 'Four'),
178178
DemoButton(name: 'Five'),
179179
DemoButton(name: 'Six'),

‎dev/tracing_tests/test/inflate_widget_tracing_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class TestRootState extends State<TestRoot> {
6565
@override
6666
Widget build(BuildContext context) {
6767
return _showRow
68-
? Row(
69-
children: const <Widget>[
68+
? const Row(
69+
children: <Widget>[
7070
TestChildWidget(),
7171
TestChildWidget(),
7272
],

‎examples/api/lib/cupertino/activity_indicator/cupertino_activity_indicator.0.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class CupertinoIndicatorExample extends StatelessWidget {
2525

2626
@override
2727
Widget build(BuildContext context) {
28-
return CupertinoPageScaffold(
29-
navigationBar: const CupertinoNavigationBar(
28+
return const CupertinoPageScaffold(
29+
navigationBar: CupertinoNavigationBar(
3030
middle: Text('CupertinoActivityIndicator Sample'),
3131
),
3232
child: Center(
@@ -35,7 +35,7 @@ class CupertinoIndicatorExample extends StatelessWidget {
3535
children: <Widget>[
3636
Column(
3737
mainAxisAlignment: MainAxisAlignment.center,
38-
children: const <Widget>[
38+
children: <Widget>[
3939
// Cupertino activity indicator with default properties.
4040
CupertinoActivityIndicator(),
4141
SizedBox(height: 10),
@@ -44,7 +44,7 @@ class CupertinoIndicatorExample extends StatelessWidget {
4444
),
4545
Column(
4646
mainAxisAlignment: MainAxisAlignment.center,
47-
children: const <Widget>[
47+
children: <Widget>[
4848
// Cupertino activity indicator with custom radius and color.
4949
CupertinoActivityIndicator(radius: 20.0, color: CupertinoColors.activeBlue),
5050
SizedBox(height: 10),
@@ -56,7 +56,7 @@ class CupertinoIndicatorExample extends StatelessWidget {
5656
),
5757
Column(
5858
mainAxisAlignment: MainAxisAlignment.center,
59-
children: const <Widget>[
59+
children: <Widget>[
6060
// Cupertino activity indicator with custom radius and disabled
6161
// animation.
6262
CupertinoActivityIndicator(radius: 20.0, animating: false),

0 commit comments

Comments
 (0)