Use curly_braces_in_flow_control_structures for material (#104499)

* Use `curly_braces_in_flow_control_structures` for `material`

* include test/material

* add back removed comments

Author: guidezpl

packages/flutter/lib/src/material/animated_icons/animated_icons.dart

@@ -110,8 +110,9 @@ class AnimatedIcon extends StatelessWidget {
     final TextDirection textDirection = this.textDirection ?? Directionality.of(context);
     final double iconOpacity = iconTheme.opacity!;
     Color iconColor = color ?? iconTheme.color!;
-    if (iconOpacity != 1.0)
+    if (iconOpacity != 1.0) {
       iconColor = iconColor.withOpacity(iconColor.opacity * iconOpacity);
+    }
     return Semantics(
       label: semanticLabel,
       child: CustomPaint(
@@ -162,8 +163,9 @@ class _AnimatedIconPainter extends CustomPainter {
     canvas.scale(scale, scale);
 
     final double clampedProgress = clampDouble(progress.value, 0.0, 1.0);
-    for (final _PathFrames path in paths)
+    for (final _PathFrames path in paths) {
       path.paint(canvas, color, uiPathFactory, clampedProgress);
+    }
   }
 
 
@@ -203,8 +205,9 @@ class _PathFrames {
       ..style = PaintingStyle.fill
       ..color = color.withOpacity(color.opacity * opacity);
     final ui.Path path = uiPathFactory();
-    for (final _PathCommand command in commands)
+    for (final _PathCommand command in commands) {
       command.apply(path, progress);
+    }
     canvas.drawPath(path, paint);
   }
 }
@@ -291,8 +294,9 @@ class _PathClose extends _PathCommand {
 T _interpolate<T>(List<T> values, double progress, _Interpolator<T> interpolator) {
   assert(progress <= 1.0);
   assert(progress >= 0.0);
-  if (values.length == 1)
+  if (values.length == 1) {
     return values[0];
+  }
   final double targetIdx = lerpDouble(0, values.length -1, progress)!;
   final int lowIdx = targetIdx.floor();
   final int highIdx = targetIdx.ceil();

packages/flutter/lib/src/material/app.dart

@@ -1000,8 +1000,9 @@ class _MaterialAppState extends State<MaterialApp> {
     result = Focus(
       canRequestFocus: false,
       onKey: (FocusNode node, RawKeyEvent event) {
-        if (event is! RawKeyDownEvent || event.logicalKey != LogicalKeyboardKey.escape)
+        if (event is! RawKeyDownEvent || event.logicalKey != LogicalKeyboardKey.escape) {
           return KeyEventResult.ignored;
+        }
         return Tooltip.dismissAllToolTips() ? KeyEventResult.handled : KeyEventResult.ignored;
       },
       child: result,

packages/flutter/lib/src/material/app_bar.dart

@@ -803,11 +803,13 @@ class _AppBarState extends State<AppBar> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (_scrollNotificationObserver != null)
+    if (_scrollNotificationObserver != null) {
       _scrollNotificationObserver!.removeListener(_handleScrollNotification);
+    }
     _scrollNotificationObserver = ScrollNotificationObserver.of(context);
-    if (_scrollNotificationObserver != null)
+    if (_scrollNotificationObserver != null) {
       _scrollNotificationObserver!.addListener(_handleScrollNotification);
+    }
   }
 
   @override
@@ -949,10 +951,12 @@ class _AppBarState extends State<AppBar> {
 
     if (widget.toolbarOpacity != 1.0) {
       final double opacity = const Interval(0.25, 1.0, curve: Curves.fastOutSlowIn).transform(widget.toolbarOpacity);
-      if (titleTextStyle?.color != null)
+      if (titleTextStyle?.color != null) {
         titleTextStyle = titleTextStyle!.copyWith(color: titleTextStyle.color!.withOpacity(opacity));
-      if (toolbarTextStyle?.color != null)
+      }
+      if (toolbarTextStyle?.color != null) {
         toolbarTextStyle = toolbarTextStyle!.copyWith(color: toolbarTextStyle.color!.withOpacity(opacity));
+      }
       overallIconTheme = overallIconTheme.copyWith(
         opacity: opacity * (overallIconTheme.opacity ?? 1.0),
       );
@@ -2050,10 +2054,12 @@ class _SliverAppBarState extends State<SliverAppBar> with TickerProviderStateMix
   @override
   void didUpdateWidget(SliverAppBar oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.snap != oldWidget.snap || widget.floating != oldWidget.floating)
+    if (widget.snap != oldWidget.snap || widget.floating != oldWidget.floating) {
       _updateSnapConfiguration();
-    if (widget.stretch != oldWidget.stretch)
+    }
+    if (widget.stretch != oldWidget.stretch) {
       _updateStretchConfiguration();
+    }
   }
 
   @override

packages/flutter/lib/src/material/app_bar_theme.dart

@@ -353,10 +353,12 @@ class AppBarTheme with Diagnosticable {
 
   @override
   bool operator ==(Object other) {
-    if (identical(this, other))
+    if (identical(this, other)) {
       return true;
-    if (other.runtimeType != runtimeType)
+    }
+    if (other.runtimeType != runtimeType) {
       return false;
+    }
     return other is AppBarTheme
         && other.brightness == brightness
         && other.backgroundColor == backgroundColor

packages/flutter/lib/src/material/arc.dart

@@ -92,21 +92,25 @@ class MaterialPointArcTween extends Tween<Offset> {
   /// The center of the circular arc, null if [begin] and [end] are horizontally or
   /// vertically aligned, or if either is null.
   Offset? get center {
-    if (begin == null || end == null)
+    if (begin == null || end == null) {
       return null;
-    if (_dirty)
+    }
+    if (_dirty) {
       _initialize();
+    }
     return _center;
   }
   Offset? _center;
 
   /// The radius of the circular arc, null if [begin] and [end] are horizontally or
   /// vertically aligned, or if either is null.
   double? get radius {
-    if (begin == null || end == null)
+    if (begin == null || end == null) {
       return null;
-    if (_dirty)
+    }
+    if (_dirty) {
       _initialize();
+    }
     return _radius;
   }
   double? _radius;
@@ -117,10 +121,12 @@ class MaterialPointArcTween extends Tween<Offset> {
   /// This will be null if [begin] and [end] are horizontally or vertically
   /// aligned, or if either is null.
   double? get beginAngle {
-    if (begin == null || end == null)
+    if (begin == null || end == null) {
       return null;
-    if (_dirty)
+    }
+    if (_dirty) {
       _initialize();
+    }
     return _beginAngle;
   }
   double? _beginAngle;
@@ -131,10 +137,12 @@ class MaterialPointArcTween extends Tween<Offset> {
   /// This will be null if [begin] and [end] are horizontally or vertically
   /// aligned, or if either is null.
   double? get endAngle {
-    if (begin == null || end == null)
+    if (begin == null || end == null) {
       return null;
-    if (_dirty)
+    }
+    if (_dirty) {
       _initialize();
+    }
     return _beginAngle;
   }
   double? _endAngle;
@@ -157,14 +165,18 @@ class MaterialPointArcTween extends Tween<Offset> {
 
   @override
   Offset lerp(double t) {
-    if (_dirty)
+    if (_dirty) {
       _initialize();
-    if (t == 0.0)
+    }
+    if (t == 0.0) {
       return begin!;
-    if (t == 1.0)
+    }
+    if (t == 1.0) {
       return end!;
-    if (_beginAngle == null || _endAngle == null)
+    }
+    if (_beginAngle == null || _endAngle == null) {
       return Offset.lerp(begin, end, t)!;
+    }
     final double angle = lerpDouble(_beginAngle, _endAngle, t)!;
     final double x = math.cos(angle) * _radius!;
     final double y = math.sin(angle) * _radius!;
@@ -279,21 +291,25 @@ class MaterialRectArcTween extends RectTween {
   /// The path of the corresponding [begin], [end] rectangle corners that lead
   /// the animation.
   MaterialPointArcTween? get beginArc {
-    if (begin == null)
+    if (begin == null) {
       return null;
-    if (_dirty)
+    }
+    if (_dirty) {
       _initialize();
+    }
     return _beginArc;
   }
   late MaterialPointArcTween _beginArc;
 
   /// The path of the corresponding [begin], [end] rectangle corners that trail
   /// the animation.
   MaterialPointArcTween? get endArc {
-    if (end == null)
+    if (end == null) {
       return null;
-    if (_dirty)
+    }
+    if (_dirty) {
       _initialize();
+    }
     return _endArc;
   }
   late MaterialPointArcTween _endArc;
@@ -316,12 +332,15 @@ class MaterialRectArcTween extends RectTween {
 
   @override
   Rect lerp(double t) {
-    if (_dirty)
+    if (_dirty) {
       _initialize();
-    if (t == 0.0)
+    }
+    if (t == 0.0) {
       return begin!;
-    if (t == 1.0)
+    }
+    if (t == 1.0) {
       return end!;
+    }
     return Rect.fromPoints(_beginArc.lerp(t), _endArc.lerp(t));
   }
 
@@ -373,10 +392,12 @@ class MaterialRectCenterArcTween extends RectTween {
   /// If [begin] and [end] are non-null, returns a tween that interpolates along
   /// a circular arc between [begin]'s [Rect.center] and [end]'s [Rect.center].
   MaterialPointArcTween? get centerArc {
-    if (begin == null || end == null)
+    if (begin == null || end == null) {
       return null;
-    if (_dirty)
+    }
+    if (_dirty) {
       _initialize();
+    }
     return _centerArc;
   }
   late MaterialPointArcTween _centerArc;
@@ -399,12 +420,15 @@ class MaterialRectCenterArcTween extends RectTween {
 
   @override
   Rect lerp(double t) {
-    if (_dirty)
+    if (_dirty) {
       _initialize();
-    if (t == 0.0)
+    }
+    if (t == 0.0) {
       return begin!;
-    if (t == 1.0)
+    }
+    if (t == 1.0) {
       return end!;
+    }
     final Offset center = _centerArc.lerp(t);
     final double width = lerpDouble(begin!.width, end!.width, t)!;
     final double height = lerpDouble(begin!.height, end!.height, t)!;

packages/flutter/lib/src/material/banner.dart

@@ -332,8 +332,9 @@ class _MaterialBannerState extends State<MaterialBanner> {
     );
 
     // This provides a static banner for backwards compatibility.
-    if (widget.animation == null)
+    if (widget.animation == null) {
       return materialBanner;
+    }
 
     materialBanner = SafeArea(
       child: materialBanner,

packages/flutter/lib/src/material/banner_theme.dart

@@ -101,10 +101,12 @@ class MaterialBannerThemeData with Diagnosticable {
 
   @override
   bool operator ==(Object other) {
-    if (identical(this, other))
+    if (identical(this, other)) {
       return true;
-    if (other.runtimeType != runtimeType)
+    }
+    if (other.runtimeType != runtimeType) {
       return false;
+    }
     return other is MaterialBannerThemeData
         && other.backgroundColor == backgroundColor
         && other.contentTextStyle == contentTextStyle

packages/flutter/lib/src/material/bottom_app_bar.dart

@@ -180,8 +180,9 @@ class _BottomAppBarClipper extends CustomClipper<Path> {
   // Material widget.
   double get bottomNavigationBarTop {
     final double? bottomNavigationBarTop = geometry.value.bottomNavigationBarTop;
-    if (bottomNavigationBarTop != null)
+    if (bottomNavigationBarTop != null) {
       return bottomNavigationBarTop;
+    }
     final RenderBox? box = materialKey.currentContext?.findRenderObject() as RenderBox?;
     return box?.localToGlobal(Offset.zero).dy ?? 0;
   }

packages/flutter/lib/src/material/bottom_app_bar_theme.dart

@@ -87,10 +87,12 @@ class BottomAppBarTheme with Diagnosticable {
 
   @override
   bool operator ==(Object other) {
-    if (identical(this, other))
+    if (identical(this, other)) {
       return true;
-    if (other.runtimeType != runtimeType)
+    }
+    if (other.runtimeType != runtimeType) {
       return false;
+    }
     return other is BottomAppBarTheme
         && other.color == color
         && other.elevation == elevation