From 83634b0814dbe2d74645d7a4f0cb021dc1c02e0e Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 1 Feb 2023 09:53:25 -0800 Subject: [PATCH 1/2] [various] Prep for more const widgets --- .../example/lib/adaptive_layout_demo.dart | 4 ++ .../example/lib/main.dart | 6 +++ packages/flutter_markdown/test/list_test.dart | 4 ++ .../test/markdown_body_shrink_wrap_test.dart | 50 +++++++++++-------- packages/rfw/example/remote/lib/main.dart | 8 +++ 5 files changed, 51 insertions(+), 21 deletions(-) diff --git a/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart b/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart index bbf46842911..2e6c7f56058 100644 --- a/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart +++ b/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart @@ -45,6 +45,8 @@ class MyHomePage extends StatelessWidget { children: [ const Divider(color: Colors.black), const SizedBox(height: 10), + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors Row( children: const [ SizedBox( @@ -150,6 +152,8 @@ class MyHomePage extends StatelessWidget { inAnimation: AdaptiveScaffold.leftOutIn, builder: (_) => AdaptiveScaffold.standardNavigationRail( extended: true, + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors leading: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: const [ diff --git a/packages/flutter_adaptive_scaffold/example/lib/main.dart b/packages/flutter_adaptive_scaffold/example/lib/main.dart index 3d287084e9e..60a863bb5be 100644 --- a/packages/flutter_adaptive_scaffold/example/lib/main.dart +++ b/packages/flutter_adaptive_scaffold/example/lib/main.dart @@ -409,6 +409,8 @@ class _LargeComposeIcon extends StatelessWidget { child: Column(children: [ Container( padding: const EdgeInsets.fromLTRB(6, 0, 0, 0), + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: const [ @@ -439,8 +441,12 @@ class _LargeComposeIcon extends StatelessWidget { ), width: 200, height: 50, + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors child: Padding( padding: const EdgeInsets.fromLTRB(16.0, 0, 0, 0), + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors child: Row( children: const [ Icon(Icons.edit_outlined), diff --git a/packages/flutter_markdown/test/list_test.dart b/packages/flutter_markdown/test/list_test.dart index 4e9f9b4ee3e..7c53a9e1a5f 100644 --- a/packages/flutter_markdown/test/list_test.dart +++ b/packages/flutter_markdown/test/list_test.dart @@ -210,6 +210,8 @@ void defineTests() { await tester.pumpWidget( boilerplate( + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors Column( children: const [ MarkdownBody(fitContent: false, data: data), @@ -233,6 +235,8 @@ void defineTests() { await tester.pumpWidget( boilerplate( + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors Column( children: const [ MarkdownBody(data: data), diff --git a/packages/flutter_markdown/test/markdown_body_shrink_wrap_test.dart b/packages/flutter_markdown/test/markdown_body_shrink_wrap_test.dart index 8cb89a20bed..9dc611be70a 100644 --- a/packages/flutter_markdown/test/markdown_body_shrink_wrap_test.dart +++ b/packages/flutter_markdown/test/markdown_body_shrink_wrap_test.dart @@ -15,17 +15,21 @@ void defineTests() { 'Given a MarkdownBody with shrinkWrap=true ' 'Then it wraps its content', (WidgetTester tester) async { - await tester.pumpWidget(boilerplate(Stack( - children: const [ - Text('shrinkWrap=true'), - Align( - alignment: Alignment.bottomCenter, - child: MarkdownBody( - data: 'This is a [link](https://flutter.dev/)', + await tester.pumpWidget(boilerplate( + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors + Stack( + children: const [ + Text('shrinkWrap=true'), + Align( + alignment: Alignment.bottomCenter, + child: MarkdownBody( + data: 'This is a [link](https://flutter.dev/)', + ), ), - ), - ], - ))); + ], + ), + )); final Rect stackRect = tester.getRect(find.byType(Stack)); final Rect textRect = tester.getRect(find.byType(Text)); @@ -43,18 +47,22 @@ void defineTests() { 'Given a MarkdownBody with shrinkWrap=false ' 'Then it expands to the maximum allowed height', (WidgetTester tester) async { - await tester.pumpWidget(boilerplate(Stack( - children: const [ - Text('shrinkWrap=false test'), - Align( - alignment: Alignment.bottomCenter, - child: MarkdownBody( - data: 'This is a [link](https://flutter.dev/)', - shrinkWrap: false, + await tester.pumpWidget(boilerplate( + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors + Stack( + children: const [ + Text('shrinkWrap=false test'), + Align( + alignment: Alignment.bottomCenter, + child: MarkdownBody( + data: 'This is a [link](https://flutter.dev/)', + shrinkWrap: false, + ), ), - ), - ], - ))); + ], + ), + )); final Rect stackRect = tester.getRect(find.byType(Stack)); final Rect textRect = tester.getRect(find.byType(Text)); diff --git a/packages/rfw/example/remote/lib/main.dart b/packages/rfw/example/remote/lib/main.dart index 646423e0023..6826ca9ebce 100644 --- a/packages/rfw/example/remote/lib/main.dart +++ b/packages/rfw/example/remote/lib/main.dart @@ -87,10 +87,18 @@ class _ExampleState extends State { }, ); } else { + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors result = Material( + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors child: SafeArea( + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors child: Padding( padding: const EdgeInsets.all(20.0), + // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. + // ignore: prefer_const_constructors child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: const [ From fd48304ed83f6e370b7284f6dcf02350c80e9c6e Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 1 Feb 2023 10:29:51 -0800 Subject: [PATCH 2/2] exclude from readme --- packages/flutter_adaptive_scaffold/README.md | 1 + .../example/lib/adaptive_layout_demo.dart | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/flutter_adaptive_scaffold/README.md b/packages/flutter_adaptive_scaffold/README.md index 9d07da101a9..0bfa20abf5d 100644 --- a/packages/flutter_adaptive_scaffold/README.md +++ b/packages/flutter_adaptive_scaffold/README.md @@ -140,6 +140,7 @@ displayed and the entrance animation and exit animation. inAnimation: AdaptiveScaffold.leftOutIn, builder: (_) => AdaptiveScaffold.standardNavigationRail( extended: true, + // ยทยทยท leading: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: const [ diff --git a/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart b/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart index 2e6c7f56058..8a4d9a1f355 100644 --- a/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart +++ b/packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart @@ -152,8 +152,10 @@ class MyHomePage extends StatelessWidget { inAnimation: AdaptiveScaffold.leftOutIn, builder: (_) => AdaptiveScaffold.standardNavigationRail( extended: true, + // #enddocregion Example // TODO(goderbauer): Make this const when this package requires Flutter 3.8 or later. // ignore: prefer_const_constructors + // #docregion Example leading: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: const [