first part of applying sort_child_properties_last (#82387)
diff --git a/packages/flutter/lib/src/cupertino/app.dart b/packages/flutter/lib/src/cupertino/app.dart
index 00c39d6..51ac1c9 100644
--- a/packages/flutter/lib/src/cupertino/app.dart
+++ b/packages/flutter/lib/src/cupertino/app.dart
@@ -442,8 +442,8 @@
case TargetPlatform.macOS:
case TargetPlatform.windows:
return CupertinoScrollbar(
- child: child,
controller: details.controller,
+ child: child,
);
case TargetPlatform.android:
case TargetPlatform.fuchsia:
@@ -489,13 +489,13 @@
Widget _inspectorSelectButtonBuilder(BuildContext context, VoidCallback onPressed) {
return CupertinoButton.filled(
+ padding: EdgeInsets.zero,
+ onPressed: onPressed,
child: const Icon(
CupertinoIcons.search,
size: 28.0,
color: CupertinoColors.white,
),
- padding: EdgeInsets.zero,
- onPressed: onPressed,
);
}
diff --git a/packages/flutter/lib/src/cupertino/context_menu.dart b/packages/flutter/lib/src/cupertino/context_menu.dart
index 88accd2..b4f2194 100644
--- a/packages/flutter/lib/src/cupertino/context_menu.dart
+++ b/packages/flutter/lib/src/cupertino/context_menu.dart
@@ -383,9 +383,9 @@
builder: (BuildContext context) {
return _DecoyChild(
beginRect: childRect,
- child: widget.child,
controller: _openController,
endRect: _decoyChildEndRect,
+ child: widget.child,
);
},
);
@@ -820,12 +820,12 @@
// in the final position.
return _ContextMenuRouteStatic(
actions: _actions,
- child: _builder!(context, animation),
childGlobalKey: _childGlobalKey,
contextMenuLocation: _contextMenuLocation,
onDismiss: _onDismiss,
orientation: orientation,
sheetGlobalKey: _sheetGlobalKey,
+ child: _builder!(context, animation),
);
},
);
diff --git a/packages/flutter/lib/src/cupertino/dialog.dart b/packages/flutter/lib/src/cupertino/dialog.dart
index 768a3ea..2621135 100644
--- a/packages/flutter/lib/src/cupertino/dialog.dart
+++ b/packages/flutter/lib/src/cupertino/dialog.dart
@@ -344,9 +344,9 @@
);
if (actions.isNotEmpty) {
actionSection = _CupertinoAlertActionSection(
- children: actions,
scrollController: actionScrollController,
isActionSheet: false,
+ children: actions,
);
}
@@ -646,10 +646,10 @@
);
}
return _CupertinoAlertActionSection(
- children: actions!,
scrollController: actionScrollController,
hasCancelButton: cancelButton != null,
isActionSheet: true,
+ children: actions!,
);
}
@@ -708,9 +708,9 @@
vertical: _kActionSheetEdgeVerticalPadding,
),
child: Column(
- children: children,
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: children,
),
),
),
@@ -788,8 +788,8 @@
),
child: DefaultTextStyle(
style: style,
- child: child,
textAlign: TextAlign.center,
+ child: child,
),
),
),
diff --git a/packages/flutter/lib/src/cupertino/nav_bar.dart b/packages/flutter/lib/src/cupertino/nav_bar.dart
index b4bae5c..e0fccad 100644
--- a/packages/flutter/lib/src/cupertino/nav_bar.dart
+++ b/packages/flutter/lib/src/cupertino/nav_bar.dart
@@ -1076,9 +1076,9 @@
route.fullscreenDialog
) {
leadingContent = CupertinoButton(
- child: const Text('Close'),
padding: EdgeInsets.zero,
onPressed: () { route.navigator!.maybePop(); },
+ child: const Text('Close'),
);
}
@@ -1318,6 +1318,7 @@
}
return CupertinoButton(
+ padding: EdgeInsets.zero,
child: Semantics(
container: true,
excludeSemantics: true,
@@ -1345,7 +1346,6 @@
),
),
),
- padding: EdgeInsets.zero,
onPressed: () {
if (onPressed != null) {
onPressed!();
diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart
index 0fefe4a..023d349 100644
--- a/packages/flutter/lib/src/cupertino/route.dart
+++ b/packages/flutter/lib/src/cupertino/route.dart
@@ -265,8 +265,8 @@
return CupertinoFullscreenDialogTransition(
primaryRouteAnimation: animation,
secondaryRouteAnimation: secondaryAnimation,
- child: child,
linearTransition: linearTransition,
+ child: child,
);
} else {
return CupertinoPageTransition(
@@ -1227,8 +1227,8 @@
return FadeTransition(
opacity: fadeAnimation,
child: ScaleTransition(
- child: child,
scale: animation.drive(_dialogScaleTween),
+ child: child,
),
);
}
diff --git a/packages/flutter/lib/src/cupertino/search_field.dart b/packages/flutter/lib/src/cupertino/search_field.dart
index b4b4b36..0f769a8 100644
--- a/packages/flutter/lib/src/cupertino/search_field.dart
+++ b/packages/flutter/lib/src/cupertino/search_field.dart
@@ -394,21 +394,24 @@
);
final Widget prefix = Padding(
+ padding: widget.prefixInsets,
child: IconTheme(
data: iconThemeData,
child: widget.prefixIcon,
),
- padding: widget.prefixInsets,
);
final Widget suffix = Padding(
+ padding: widget.suffixInsets,
child: CupertinoButton(
- child: IconTheme(child: widget.suffixIcon, data: iconThemeData),
onPressed: widget.onSuffixTap ?? _defaultOnSuffixTap,
minSize: 0,
padding: EdgeInsets.zero,
+ child: IconTheme(
+ data: iconThemeData,
+ child: widget.suffixIcon,
+ ),
),
- padding: widget.suffixInsets,
);
return CupertinoTextField(
diff --git a/packages/flutter/lib/src/cupertino/segmented_control.dart b/packages/flutter/lib/src/cupertino/segmented_control.dart
index 46aee0a..5bc407e 100644
--- a/packages/flutter/lib/src/cupertino/segmented_control.dart
+++ b/packages/flutter/lib/src/cupertino/segmented_control.dart
@@ -409,11 +409,11 @@
}
final Widget box = _SegmentedControlRenderWidget<T>(
- children: _gestureChildren,
selectedIndex: selectedIndex,
pressedIndex: pressedIndex,
backgroundColors: _backgroundColors,
borderColor: _borderColor!,
+ children: _gestureChildren,
);
return Padding(
diff --git a/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart b/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart
index c774a16..ed1f6c5 100644
--- a/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart
+++ b/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart
@@ -687,11 +687,11 @@
animation: thumbScaleAnimation,
builder: (BuildContext context, Widget? child) {
return _SegmentedControlRenderWidget<T>(
- children: children,
highlightedIndex: highlightedIndex,
thumbColor: CupertinoDynamicColor.resolve(widget.thumbColor, context),
thumbScale: thumbScaleAnimation.value,
state: this,
+ children: children,
);
},
),
diff --git a/packages/flutter/lib/src/material/app.dart b/packages/flutter/lib/src/material/app.dart
index f4d0957..0e0d747 100644
--- a/packages/flutter/lib/src/material/app.dart
+++ b/packages/flutter/lib/src/material/app.dart
@@ -713,8 +713,8 @@
case TargetPlatform.macOS:
case TargetPlatform.windows:
return Scrollbar(
- child: child,
controller: details.controller,
+ child: child,
);
case TargetPlatform.android:
case TargetPlatform.fuchsia:
@@ -737,9 +737,9 @@
case TargetPlatform.android:
case TargetPlatform.fuchsia:
return GlowingOverscrollIndicator(
- child: child,
axisDirection: details.direction,
color: Theme.of(context).colorScheme.secondary,
+ child: child,
);
}
}
@@ -770,9 +770,9 @@
Widget _inspectorSelectButtonBuilder(BuildContext context, VoidCallback onPressed) {
return FloatingActionButton(
- child: const Icon(Icons.search),
onPressed: onPressed,
mini: true,
+ child: const Icon(Icons.search),
);
}
diff --git a/packages/flutter/lib/src/material/app_bar.dart b/packages/flutter/lib/src/material/app_bar.dart
index e20e66c..81b31ec 100644
--- a/packages/flutter/lib/src/material/app_bar.dart
+++ b/packages/flutter/lib/src/material/app_bar.dart
@@ -901,8 +901,8 @@
if (!widget.excludeHeaderSemantics) {
title = Semantics(
namesRoute: namesRoute,
- child: title,
header: true,
+ child: title,
);
}
@@ -1186,7 +1186,10 @@
title: title,
actions: actions,
flexibleSpace: (title == null && flexibleSpace != null && !excludeHeaderSemantics)
- ? Semantics(child: flexibleSpace, header: true)
+ ? Semantics(
+ header: true,
+ child: flexibleSpace,
+ )
: flexibleSpace,
bottom: bottom,
elevation: forceElevated || isScrolledUnder ? elevation : 0.0,
diff --git a/packages/flutter/lib/src/material/button_bar.dart b/packages/flutter/lib/src/material/button_bar.dart
index ad09c98..2e3b839 100644
--- a/packages/flutter/lib/src/material/button_bar.dart
+++ b/packages/flutter/lib/src/material/button_bar.dart
@@ -188,13 +188,13 @@
mainAxisAlignment: alignment ?? barTheme.alignment ?? MainAxisAlignment.end,
mainAxisSize: mainAxisSize ?? barTheme.mainAxisSize ?? MainAxisSize.max,
overflowDirection: overflowDirection ?? barTheme.overflowDirection ?? VerticalDirection.down,
+ overflowButtonSpacing: overflowButtonSpacing,
children: children.map<Widget>((Widget child) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: paddingUnit),
child: child,
);
}).toList(),
- overflowButtonSpacing: overflowButtonSpacing,
),
);
switch (buttonTheme.layoutBehavior) {
diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
index d4595d9..db56e5f 100644
--- a/packages/flutter/lib/src/material/chip.dart
+++ b/packages/flutter/lib/src/material/chip.dart
@@ -1982,14 +1982,14 @@
child: widget.label,
),
avatar: AnimatedSwitcher(
- child: widget.avatar,
duration: _kDrawerDuration,
switchInCurve: Curves.fastOutSlowIn,
+ child: widget.avatar,
),
deleteIcon: AnimatedSwitcher(
- child: _buildDeleteIcon(context, theme, chipTheme, deleteIconKey),
duration: _kDrawerDuration,
switchInCurve: Curves.fastOutSlowIn,
+ child: _buildDeleteIcon(context, theme, chipTheme, deleteIconKey),
),
brightness: chipTheme.brightness,
padding: (widget.padding ?? chipTheme.padding).resolve(textDirection),
@@ -2028,9 +2028,9 @@
result = _ChipRedirectingHitDetectionWidget(
constraints: constraints,
child: Center(
- child: result,
widthFactor: 1.0,
heightFactor: 1.0,
+ child: result,
),
);
return Semantics(
diff --git a/packages/flutter/lib/src/material/data_table.dart b/packages/flutter/lib/src/material/data_table.dart
index 5e99007..9153b26 100644
--- a/packages/flutter/lib/src/material/data_table.dart
+++ b/packages/flutter/lib/src/material/data_table.dart
@@ -790,8 +790,8 @@
if (onRowTap != null) {
contents = TableRowInkWell(
onTap: onRowTap,
- child: contents,
overlayColor: overlayColor,
+ child: contents,
);
}
return TableCell(
@@ -915,14 +915,14 @@
onLongPress: onLongPress,
onTapCancel: onTapCancel,
onTapDown: onTapDown,
- child: label,
overlayColor: overlayColor,
+ child: label,
);
} else if (onSelectChanged != null) {
label = TableRowInkWell(
onTap: onSelectChanged,
- child: label,
overlayColor: overlayColor,
+ child: label,
);
}
return label;
diff --git a/packages/flutter/lib/src/material/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart
index beef8b3..661677b 100644
--- a/packages/flutter/lib/src/material/date_picker.dart
+++ b/packages/flutter/lib/src/material/date_picker.dart
@@ -528,12 +528,12 @@
spacing: 8,
children: <Widget>[
TextButton(
- child: Text(widget.cancelText ?? localizations.cancelButtonLabel),
onPressed: _handleCancel,
+ child: Text(widget.cancelText ?? localizations.cancelButtonLabel),
),
TextButton(
- child: Text(widget.confirmText ?? localizations.okButtonLabel),
onPressed: _handleOk,
+ child: Text(widget.confirmText ?? localizations.okButtonLabel),
),
],
),
@@ -630,6 +630,8 @@
final Size dialogSize = _dialogSize(context) * textScaleFactor;
return Dialog(
+ insetPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 24.0),
+ clipBehavior: Clip.antiAlias,
child: AnimatedContainer(
width: dialogSize.width,
height: dialogSize.height,
@@ -673,8 +675,6 @@
}),
),
),
- insetPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 24.0),
- clipBehavior: Clip.antiAlias,
);
}
}
@@ -1512,6 +1512,10 @@
}
return Dialog(
+ insetPadding: insetPadding,
+ shape: shape,
+ elevation: elevation,
+ clipBehavior: Clip.antiAlias,
child: AnimatedContainer(
width: size.width,
height: size.height,
@@ -1526,10 +1530,6 @@
}),
),
),
- insetPadding: insetPadding,
- shape: shape,
- elevation: elevation,
- clipBehavior: Clip.antiAlias,
);
}
}
@@ -1607,6 +1607,7 @@
const SizedBox(width: 8),
],
bottom: PreferredSize(
+ preferredSize: const Size(double.infinity, 64),
child: Row(children: <Widget>[
SizedBox(width: MediaQuery.of(context).size.width < 360 ? 42 : 72),
Expanded(
@@ -1654,7 +1655,6 @@
child: entryModeButton!,
),
]),
- preferredSize: const Size(double.infinity, 64),
),
),
body: _CalendarDateRangePicker(
@@ -2725,12 +2725,12 @@
spacing: 8,
children: <Widget>[
TextButton(
- child: Text(cancelText ?? localizations.cancelButtonLabel),
onPressed: onCancel,
+ child: Text(cancelText ?? localizations.cancelButtonLabel),
),
TextButton(
- child: Text(confirmText ?? localizations.okButtonLabel),
onPressed: onConfirm,
+ child: Text(confirmText ?? localizations.okButtonLabel),
),
],
),
diff --git a/packages/flutter/lib/src/material/date_picker_deprecated.dart b/packages/flutter/lib/src/material/date_picker_deprecated.dart
index 3fa5e42..a9a2087 100644
--- a/packages/flutter/lib/src/material/date_picker_deprecated.dart
+++ b/packages/flutter/lib/src/material/date_picker_deprecated.dart
@@ -301,8 +301,8 @@
onTap: () {
onChanged(dayToBuild);
},
- child: dayWidget,
dragStartBehavior: dragStartBehavior,
+ child: dayWidget,
);
}
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
index 556e0d4..d915eca 100644
--- a/packages/flutter/lib/src/material/dialog.dart
+++ b/packages/flutter/lib/src/material/dialog.dart
@@ -507,9 +507,9 @@
child: DefaultTextStyle(
style: titleTextStyle ?? dialogTheme.titleTextStyle ?? theme.textTheme.headline6!,
child: Semantics(
- child: title,
namesRoute: label == null,
container: true,
+ child: title,
),
),
);
diff --git a/packages/flutter/lib/src/material/dropdown.dart b/packages/flutter/lib/src/material/dropdown.dart
index 165306f..696e51b 100644
--- a/packages/flutter/lib/src/material/dropdown.dart
+++ b/packages/flutter/lib/src/material/dropdown.dart
@@ -176,9 +176,9 @@
child = InkWell(
autofocus: widget.itemIndex == widget.route.selectedIndex,
enableFeedback: widget.enableFeedback,
- child: child,
onTap: _handleOnTap,
onFocusChange: _handleFocusChange,
+ child: child,
);
}
child = FadeTransition(opacity: opacity, child: child);
diff --git a/packages/flutter/lib/src/material/expansion_tile.dart b/packages/flutter/lib/src/material/expansion_tile.dart
index 8d9faad..0f8c34e 100644
--- a/packages/flutter/lib/src/material/expansion_tile.dart
+++ b/packages/flutter/lib/src/material/expansion_tile.dart
@@ -309,7 +309,9 @@
final bool shouldRemoveChildren = closed && !widget.maintainState;
final Widget result = Offstage(
+ offstage: closed,
child: TickerMode(
+ enabled: !closed,
child: Padding(
padding: widget.childrenPadding ?? EdgeInsets.zero,
child: Column(
@@ -317,9 +319,7 @@
children: widget.children,
),
),
- enabled: !closed,
),
- offstage: closed,
);
return AnimatedBuilder(
diff --git a/packages/flutter/lib/src/material/flexible_space_bar.dart b/packages/flutter/lib/src/material/flexible_space_bar.dart
index 61b01ad..800085f 100644
--- a/packages/flutter/lib/src/material/flexible_space_bar.dart
+++ b/packages/flutter/lib/src/material/flexible_space_bar.dart
@@ -337,13 +337,13 @@
final double blurAmount = (constraints.maxHeight - settings.maxExtent) / 10;
children.add(Positioned.fill(
child: BackdropFilter(
- child: Container(
- color: Colors.transparent,
- ),
filter: ui.ImageFilter.blur(
sigmaX: blurAmount,
sigmaY: blurAmount,
),
+ child: Container(
+ color: Colors.transparent,
+ ),
),
));
}
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
index 14d0736..9f6d768 100644
--- a/packages/flutter/lib/src/material/floating_action_button.dart
+++ b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -499,8 +499,8 @@
clipBehavior: clipBehavior,
focusNode: focusNode,
autofocus: autofocus,
- child: child,
enableFeedback: enableFeedback,
+ child: child,
);
if (tooltip != null) {
diff --git a/packages/flutter/lib/src/material/icon_button.dart b/packages/flutter/lib/src/material/icon_button.dart
index 0b36c5e..940e7f8 100644
--- a/packages/flutter/lib/src/material/icon_button.dart
+++ b/packages/flutter/lib/src/material/icon_button.dart
@@ -381,7 +381,6 @@
onTap: onPressed,
mouseCursor: mouseCursor,
enableFeedback: enableFeedback,
- child: result,
focusColor: focusColor ?? theme.focusColor,
hoverColor: hoverColor ?? theme.hoverColor,
highlightColor: highlightColor ?? theme.highlightColor,
@@ -391,6 +390,7 @@
(iconSize + math.min(padding.horizontal, padding.vertical)) * 0.7,
// x 0.5 for diameter -> radius and + 40% overflow derived from other Material apps.
),
+ child: result,
),
);
}
diff --git a/packages/flutter/lib/src/material/ink_well.dart b/packages/flutter/lib/src/material/ink_well.dart
index a13f7e9..84c2d51 100644
--- a/packages/flutter/lib/src/material/ink_well.dart
+++ b/packages/flutter/lib/src/material/ink_well.dart
@@ -580,7 +580,6 @@
Widget build(BuildContext context) {
final _ParentInkResponseState? parentState = _ParentInkResponseProvider.of(context);
return _InkResponseStateWidget(
- child: child,
onTap: onTap,
onTapDown: onTapDown,
onTapCancel: onTapCancel,
@@ -609,6 +608,7 @@
parentState: parentState,
getRectCallback: getRectCallback,
debugCheckContext: debugCheckContext,
+ child: child,
);
}
diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart
index bb87b8f..c761fc5 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -385,8 +385,8 @@
key: _inkFeatureRenderer,
absorbHitTest: widget.type != MaterialType.transparency,
color: backgroundColor,
- child: contents,
vsync: this,
+ child: contents,
),
);
@@ -445,19 +445,19 @@
required Widget contents,
}) {
final _ShapeBorderPaint child = _ShapeBorderPaint(
- child: contents,
shape: shape,
+ child: contents,
);
if (clipBehavior == Clip.none) {
return child;
}
return ClipPath(
- child: child,
clipper: ShapeBorderClipper(
shape: shape,
textDirection: Directionality.maybeOf(context),
),
clipBehavior: clipBehavior,
+ child: child,
);
}
@@ -781,11 +781,6 @@
final ShapeBorder shape = _border!.evaluate(animation)!;
final double elevation = _elevation!.evaluate(animation);
return PhysicalShape(
- child: _ShapeBorderPaint(
- child: widget.child,
- shape: shape,
- borderOnForeground: widget.borderOnForeground,
- ),
clipper: ShapeBorderClipper(
shape: shape,
textDirection: Directionality.maybeOf(context),
@@ -794,6 +789,11 @@
elevation: elevation,
color: ElevationOverlay.applyOverlay(context, widget.color, elevation),
shadowColor: _shadowColor!.evaluate(animation)!,
+ child: _ShapeBorderPaint(
+ shape: shape,
+ borderOnForeground: widget.borderOnForeground,
+ child: widget.child,
+ ),
);
}
}
@@ -812,9 +812,9 @@
@override
Widget build(BuildContext context) {
return CustomPaint(
- child: child,
painter: borderOnForeground ? null : _ShapeBorderPainter(shape, Directionality.maybeOf(context)),
foregroundPainter: borderOnForeground ? _ShapeBorderPainter(shape, Directionality.maybeOf(context)) : null,
+ child: child,
);
}
}
diff --git a/packages/flutter/lib/src/material/material_button.dart b/packages/flutter/lib/src/material/material_button.dart
index 9fb5522..1e855bd 100644
--- a/packages/flutter/lib/src/material/material_button.dart
+++ b/packages/flutter/lib/src/material/material_button.dart
@@ -427,9 +427,9 @@
focusNode: focusNode,
autofocus: autofocus,
animationDuration: buttonTheme.getAnimationDuration(this),
- child: child,
materialTapTargetSize: materialTapTargetSize ?? theme.materialTapTargetSize,
disabledElevation: disabledElevation ?? 0.0,
+ child: child,
);
}
diff --git a/packages/flutter/lib/src/material/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart
index 6839898..6117e1d 100644
--- a/packages/flutter/lib/src/material/popup_menu.dart
+++ b/packages/flutter/lib/src/material/popup_menu.dart
@@ -1169,8 +1169,8 @@
child: InkWell(
onTap: widget.enabled ? showButtonMenu : null,
canRequestFocus: _canRequestFocus,
- child: widget.child,
enableFeedback: enableFeedback,
+ child: widget.child,
),
);
diff --git a/packages/flutter/lib/src/material/reorderable_list.dart b/packages/flutter/lib/src/material/reorderable_list.dart
index e70f963..74e21eb 100644
--- a/packages/flutter/lib/src/material/reorderable_list.dart
+++ b/packages/flutter/lib/src/material/reorderable_list.dart
@@ -491,8 +491,8 @@
final double animValue = Curves.easeInOut.transform(animation.value);
final double elevation = lerpDouble(0, 6, animValue)!;
return Material(
- child: child,
elevation: elevation,
+ child: child,
);
},
child: child,
diff --git a/packages/flutter/lib/src/material/scaffold.dart b/packages/flutter/lib/src/material/scaffold.dart
index f855603..0cdd346 100644
--- a/packages/flutter/lib/src/material/scaffold.dart
+++ b/packages/flutter/lib/src/material/scaffold.dart
@@ -2919,13 +2919,13 @@
DrawerController(
key: _endDrawerKey,
alignment: DrawerAlignment.end,
- child: widget.endDrawer!,
drawerCallback: _endDrawerOpenedCallback,
dragStartBehavior: widget.drawerDragStartBehavior,
scrimColor: widget.drawerScrimColor,
edgeDragWidth: widget.drawerEdgeDragWidth,
enableOpenDragGesture: widget.endDrawerEnableOpenDragGesture,
isDrawerOpen: _endDrawerOpened.value,
+ child: widget.endDrawer!,
),
_ScaffoldSlot.endDrawer,
// remove the side padding from the side we're not touching
@@ -2945,13 +2945,13 @@
DrawerController(
key: _drawerKey,
alignment: DrawerAlignment.start,
- child: widget.drawer!,
drawerCallback: _drawerOpenedCallback,
dragStartBehavior: widget.drawerDragStartBehavior,
scrimColor: widget.drawerScrimColor,
edgeDragWidth: widget.drawerEdgeDragWidth,
enableOpenDragGesture: widget.drawerEnableOpenDragGesture,
isDrawerOpen: _drawerOpened.value,
+ child: widget.drawer!,
),
_ScaffoldSlot.drawer,
// remove the side padding from the side we're not touching
@@ -3185,11 +3185,11 @@
_addIfNonNull(
children,
_FloatingActionButtonTransition(
- child: widget.floatingActionButton,
fabMoveAnimation: _floatingActionButtonMoveController,
fabMotionAnimator: _floatingActionButtonAnimator,
geometryNotifier: _geometryNotifier,
currentController: _floatingActionButtonVisibilityController,
+ child: widget.floatingActionButton,
),
_ScaffoldSlot.floatingActionButton,
removeLeftPadding: true,
@@ -3253,7 +3253,6 @@
color: widget.backgroundColor ?? themeData.scaffoldBackgroundColor,
child: AnimatedBuilder(animation: _floatingActionButtonMoveController, builder: (BuildContext context, Widget? child) {
return CustomMultiChildLayout(
- children: children,
delegate: _ScaffoldLayout(
extendBody: _extendBody,
extendBodyBehindAppBar: widget.extendBodyBehindAppBar,
@@ -3268,6 +3267,7 @@
isSnackBarFloating: isSnackBarFloating,
snackBarWidth: snackBarWidth,
),
+ children: children,
);
}),
),
diff --git a/packages/flutter/lib/src/material/scrollbar.dart b/packages/flutter/lib/src/material/scrollbar.dart
index 6f68528..cd445c4 100644
--- a/packages/flutter/lib/src/material/scrollbar.dart
+++ b/packages/flutter/lib/src/material/scrollbar.dart
@@ -176,7 +176,6 @@
Widget build(BuildContext context) {
if (_useCupertinoScrollbar) {
return CupertinoScrollbar(
- child: widget.child,
isAlwaysShown: widget.isAlwaysShown ?? false,
thickness: widget.thickness ?? CupertinoScrollbar.defaultThickness,
thicknessWhileDragging: widget.thickness ?? CupertinoScrollbar.defaultThicknessWhileDragging,
@@ -184,10 +183,10 @@
radiusWhileDragging: widget.radius ?? CupertinoScrollbar.defaultRadiusWhileDragging,
controller: widget.controller,
notificationPredicate: widget.notificationPredicate,
+ child: widget.child,
);
}
return _MaterialScrollbar(
- child: widget.child,
controller: widget.controller,
isAlwaysShown: widget.isAlwaysShown,
showTrackOnHover: widget.showTrackOnHover,
@@ -196,6 +195,7 @@
radius: widget.radius,
notificationPredicate: widget.notificationPredicate,
interactive: widget.interactive,
+ child: widget.child,
);
}
}
diff --git a/packages/flutter/lib/src/material/snack_bar.dart b/packages/flutter/lib/src/material/snack_bar.dart
index 5bb328f..08c0a00 100644
--- a/packages/flutter/lib/src/material/snack_bar.dart
+++ b/packages/flutter/lib/src/material/snack_bar.dart
@@ -632,8 +632,8 @@
}
return Hero(
- child: ClipRect(child: snackBarTransition),
tag: '<SnackBar Hero tag - ${widget.content}>',
+ child: ClipRect(child: snackBarTransition),
);
}
}
diff --git a/packages/flutter/lib/src/material/tabs.dart b/packages/flutter/lib/src/material/tabs.dart
index 1279f98..669fddb 100644
--- a/packages/flutter/lib/src/material/tabs.dart
+++ b/packages/flutter/lib/src/material/tabs.dart
@@ -119,8 +119,8 @@
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
- child: icon,
margin: iconMargin,
+ child: icon,
),
_buildLabelText(),
],
@@ -130,8 +130,8 @@
return SizedBox(
height: height,
child: Center(
- child: label,
widthFactor: 1.0,
+ child: label,
),
);
}
diff --git a/packages/flutter/lib/src/material/theme.dart b/packages/flutter/lib/src/material/theme.dart
index 9355d8f..4e717ed 100644
--- a/packages/flutter/lib/src/material/theme.dart
+++ b/packages/flutter/lib/src/material/theme.dart
@@ -227,8 +227,8 @@
@override
Widget build(BuildContext context) {
return Theme(
- child: widget.child,
data: _data!.evaluate(animation),
+ child: widget.child,
);
}
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 45e42eb..b387fde 100644
--- a/packages/flutter/lib/src/material/user_accounts_drawer_header.dart
+++ b/packages/flutter/lib/src/material/user_accounts_drawer_header.dart
@@ -199,8 +199,8 @@
if (widget.onTap != null) {
accountDetails = InkWell(
onTap: widget.onTap,
- child: accountDetails,
excludeFromSemantics: true,
+ child: accountDetails,
);
}
diff --git a/packages/flutter/lib/src/widgets/animated_size.dart b/packages/flutter/lib/src/widgets/animated_size.dart
index 15224dc..6cc682e 100644
--- a/packages/flutter/lib/src/widgets/animated_size.dart
+++ b/packages/flutter/lib/src/widgets/animated_size.dart
@@ -123,13 +123,13 @@
@override
Widget build(BuildContext context) {
return _AnimatedSize(
- child: widget.child,
alignment: widget.alignment,
curve: widget.curve,
duration: widget.duration,
reverseDuration: widget.reverseDuration,
vsync: this,
clipBehavior: widget.clipBehavior,
+ child: widget.child,
);
}
}
diff --git a/packages/flutter/lib/src/widgets/animated_switcher.dart b/packages/flutter/lib/src/widgets/animated_switcher.dart
index 877ed1c..79d1697 100644
--- a/packages/flutter/lib/src/widgets/animated_switcher.dart
+++ b/packages/flutter/lib/src/widgets/animated_switcher.dart
@@ -273,11 +273,11 @@
/// This is an [AnimatedSwitcherLayoutBuilder] function.
static Widget defaultLayoutBuilder(Widget? currentChild, List<Widget> previousChildren) {
return Stack(
+ alignment: Alignment.center,
children: <Widget>[
...previousChildren,
if (currentChild != null) currentChild,
],
- alignment: Alignment.center,
);
}
diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/widgets/app.dart
index bf6cb09..1f67b49 100644
--- a/packages/flutter/lib/src/widgets/app.dart
+++ b/packages/flutter/lib/src/widgets/app.dart
@@ -1592,8 +1592,8 @@
assert(() {
if (widget.debugShowWidgetInspector || WidgetsApp.debugShowWidgetInspectorOverride) {
result = WidgetInspector(
- child: result,
selectButtonBuilder: widget.inspectorSelectButtonBuilder,
+ child: result,
);
}
if (widget.debugShowCheckedModeBanner && WidgetsApp.debugAllowBannerOverride) {
diff --git a/packages/flutter/lib/src/widgets/banner.dart b/packages/flutter/lib/src/widgets/banner.dart
index 8c93969..964719a 100644
--- a/packages/flutter/lib/src/widgets/banner.dart
+++ b/packages/flutter/lib/src/widgets/banner.dart
@@ -345,10 +345,10 @@
Widget result = child;
assert(() {
result = Banner(
- child: result,
message: 'DEBUG',
textDirection: TextDirection.ltr,
location: BannerLocation.topEnd,
+ child: result,
);
return true;
}());
diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart
index f7baa91..7d525f1 100644
--- a/packages/flutter/lib/src/widgets/basic.dart
+++ b/packages/flutter/lib/src/widgets/basic.dart
@@ -2653,11 +2653,11 @@
@override
Widget build(BuildContext context) {
return ConstraintsTransformBox(
- child: child,
textDirection: textDirection,
alignment: alignment,
clipBehavior: clipBehavior,
constraintsTransform: _axisToTransform(constrainedAxis),
+ child: child,
);
}
diff --git a/packages/flutter/lib/src/widgets/container.dart b/packages/flutter/lib/src/widgets/container.dart
index a487fb7..2d01ba3 100644
--- a/packages/flutter/lib/src/widgets/container.dart
+++ b/packages/flutter/lib/src/widgets/container.dart
@@ -431,7 +431,7 @@
current = Padding(padding: margin!, child: current);
if (transform != null)
- current = Transform(transform: transform!, child: current, alignment: transformAlignment);
+ current = Transform(transform: transform!, alignment: transformAlignment, child: current);
return current!;
}
diff --git a/packages/flutter/lib/src/widgets/dismissible.dart b/packages/flutter/lib/src/widgets/dismissible.dart
index e7943f8..5a43f39 100644
--- a/packages/flutter/lib/src/widgets/dismissible.dart
+++ b/packages/flutter/lib/src/widgets/dismissible.dart
@@ -618,8 +618,8 @@
onVerticalDragUpdate: _directionIsXAxis ? null : _handleDragUpdate,
onVerticalDragEnd: _directionIsXAxis ? null : _handleDragEnd,
behavior: widget.behavior,
- child: content,
dragStartBehavior: widget.dragStartBehavior,
+ child: content,
);
}
}
diff --git a/packages/flutter/lib/src/widgets/drag_target.dart b/packages/flutter/lib/src/widgets/drag_target.dart
index f0745e2..2f833a8 100644
--- a/packages/flutter/lib/src/widgets/drag_target.dart
+++ b/packages/flutter/lib/src/widgets/drag_target.dart
@@ -1007,8 +1007,8 @@
left: _lastOffset!.dx - overlayTopLeft.dx,
top: _lastOffset!.dy - overlayTopLeft.dy,
child: IgnorePointer(
- child: feedback,
ignoringSemantics: ignoringFeedbackSemantics,
+ child: feedback,
),
);
}
diff --git a/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart b/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart
index 4fd3e95..eaaeca8 100644
--- a/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart
+++ b/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart
@@ -335,8 +335,8 @@
_extent.availablePixels = widget.maxChildSize * constraints.biggest.height;
final Widget sheet = FractionallySizedBox(
heightFactor: _extent.currentExtent,
- child: widget.builder(context, _scrollController),
alignment: Alignment.bottomCenter,
+ child: widget.builder(context, _scrollController),
);
return widget.expand ? SizedBox.expand(child: sheet) : sheet;
},
@@ -554,7 +554,7 @@
@override
Widget build(BuildContext context) {
- return _InheritedResetNotifier(child: child, notifier: _notifier);
+ return _InheritedResetNotifier(notifier: _notifier, child: child);
}
}
diff --git a/packages/flutter/lib/src/widgets/implicit_animations.dart b/packages/flutter/lib/src/widgets/implicit_animations.dart
index d000bb7..3c52603 100644
--- a/packages/flutter/lib/src/widgets/implicit_animations.dart
+++ b/packages/flutter/lib/src/widgets/implicit_animations.dart
@@ -772,7 +772,6 @@
Widget build(BuildContext context) {
final Animation<double> animation = this.animation;
return Container(
- child: widget.child,
alignment: _alignment?.evaluate(animation),
padding: _padding?.evaluate(animation),
decoration: _decoration?.evaluate(animation),
@@ -782,6 +781,7 @@
transform: _transform?.evaluate(animation),
transformAlignment: _transformAlignment?.evaluate(animation),
clipBehavior: widget.clipBehavior,
+ child: widget.child,
);
}
@@ -1248,13 +1248,13 @@
@override
Widget build(BuildContext context) {
return Positioned(
- child: widget.child,
left: _left?.evaluate(animation),
top: _top?.evaluate(animation),
right: _right?.evaluate(animation),
bottom: _bottom?.evaluate(animation),
width: _width?.evaluate(animation),
height: _height?.evaluate(animation),
+ child: widget.child,
);
}
@@ -1385,13 +1385,13 @@
assert(debugCheckHasDirectionality(context));
return Positioned.directional(
textDirection: Directionality.of(context),
- child: widget.child,
start: _start?.evaluate(animation),
top: _top?.evaluate(animation),
end: _end?.evaluate(animation),
bottom: _bottom?.evaluate(animation),
width: _width?.evaluate(animation),
height: _height?.evaluate(animation),
+ child: widget.child,
);
}
@@ -1532,8 +1532,8 @@
Widget build(BuildContext context) {
return FadeTransition(
opacity: _opacityAnimation,
- child: widget.child,
alwaysIncludeSemantics: widget.alwaysIncludeSemantics,
+ child: widget.child,
);
}
}
@@ -1919,7 +1919,6 @@
@override
Widget build(BuildContext context) {
return PhysicalModel(
- child: widget.child,
shape: widget.shape,
clipBehavior: widget.clipBehavior,
borderRadius: _borderRadius!.evaluate(animation),
@@ -1928,6 +1927,7 @@
shadowColor: widget.animateShadowColor
? _shadowColor!.evaluate(animation)!
: widget.shadowColor,
+ child: widget.child,
);
}
}
diff --git a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart
index 648f912..b16699a 100644
--- a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart
+++ b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart
@@ -93,7 +93,7 @@
Widget? build(BuildContext context, int index) {
if (index < 0 || index >= children.length)
return null;
- return IndexedSemantics(child: children[index], index: index);
+ return IndexedSemantics(index: index, child: children[index]);
}
@override
@@ -139,7 +139,7 @@
Widget? build(BuildContext context, int index) {
if (children.isEmpty)
return null;
- return IndexedSemantics(child: children[index % children.length], index: index);
+ return IndexedSemantics(index: index, child: children[index % children.length]);
}
@override
@@ -182,11 +182,11 @@
Widget? build(BuildContext context, int index) {
if (childCount == null) {
final Widget? child = builder(context, index);
- return child == null ? null : IndexedSemantics(child: child, index: index);
+ return child == null ? null : IndexedSemantics(index: index, child: child);
}
if (index < 0 || index >= childCount!)
return null;
- return IndexedSemantics(child: builder(context, index), index: index);
+ return IndexedSemantics(index: index, child: builder(context, index));
}
@override
diff --git a/packages/flutter/lib/src/widgets/overlay.dart b/packages/flutter/lib/src/widgets/overlay.dart
index 104f5cc..f401d29 100644
--- a/packages/flutter/lib/src/widgets/overlay.dart
+++ b/packages/flutter/lib/src/widgets/overlay.dart
@@ -507,8 +507,8 @@
}
return _Theatre(
skipCount: children.length - onstageCount,
- children: children.reversed.toList(growable: false),
clipBehavior: widget.clipBehavior,
+ children: children.reversed.toList(growable: false),
);
}
diff --git a/packages/flutter/lib/src/widgets/reorderable_list.dart b/packages/flutter/lib/src/widgets/reorderable_list.dart
index 46f9220..e5594a2 100644
--- a/packages/flutter/lib/src/widgets/reorderable_list.dart
+++ b/packages/flutter/lib/src/widgets/reorderable_list.dart
@@ -852,8 +852,8 @@
return _ReorderableItem(
key: _ReorderableItemGlobalKey(child.key!, index, this),
index: index,
- child: child,
capturedThemes: InheritedTheme.capture(from: context, to: overlay.context),
+ child: child,
);
}
@@ -1221,11 +1221,11 @@
_DragItemProxy(
listState: listState,
index: index,
- child: child,
size: itemSize,
animation: _proxyAnimation!,
position: dragPosition - dragOffset - _overlayOrigin(context),
proxyDecorator: proxyDecorator,
+ child: child,
),
);
}
@@ -1270,14 +1270,14 @@
if (dropPosition != null) {
effectivePosition = Offset.lerp(dropPosition - overlayOrigin, effectivePosition, Curves.easeOut.transform(animation.value))!;
}
- return Positioned(
+ return Positioned(
+ left: effectivePosition.dx,
+ top: effectivePosition.dy,
child: SizedBox(
width: size.width,
height: size.height,
child: child,
),
- left: effectivePosition.dx,
- top: effectivePosition.dy,
);
},
child: proxyChild,
diff --git a/packages/flutter/lib/src/widgets/routes.dart b/packages/flutter/lib/src/widgets/routes.dart
index 79fc18b..3050cd9 100644
--- a/packages/flutter/lib/src/widgets/routes.dart
+++ b/packages/flutter/lib/src/widgets/routes.dart
@@ -1823,9 +1823,9 @@
@override
Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
return Semantics(
- child: _pageBuilder(context, animation, secondaryAnimation),
scopesRoute: true,
explicitChildNodes: true,
+ child: _pageBuilder(context, animation, secondaryAnimation),
);
}
diff --git a/packages/flutter/lib/src/widgets/scroll_configuration.dart b/packages/flutter/lib/src/widgets/scroll_configuration.dart
index 2cbb528..db9de23 100644
--- a/packages/flutter/lib/src/widgets/scroll_configuration.dart
+++ b/packages/flutter/lib/src/widgets/scroll_configuration.dart
@@ -108,9 +108,9 @@
case TargetPlatform.android:
case TargetPlatform.fuchsia:
return GlowingOverscrollIndicator(
- child: child,
axisDirection: axisDirection,
color: _kDefaultGlowColor,
+ child: child,
);
}
}
@@ -124,8 +124,8 @@
case TargetPlatform.macOS:
case TargetPlatform.windows:
return RawScrollbar(
- child: child,
controller: details.controller,
+ child: child,
);
case TargetPlatform.android:
case TargetPlatform.fuchsia:
diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart
index 80a4142..4198cfe 100644
--- a/packages/flutter/lib/src/widgets/scrollable.dart
+++ b/packages/flutter/lib/src/widgets/scrollable.dart
@@ -758,10 +758,10 @@
if (!widget.excludeFromSemantics) {
result = _ScrollSemantics(
key: _scrollSemanticsKey,
- child: result,
position: position,
allowImplicitScrolling: _physics!.allowImplicitScrolling,
semanticChildCount: widget.semanticChildCount,
+ child: result,
);
}
diff --git a/packages/flutter/lib/src/widgets/single_child_scroll_view.dart b/packages/flutter/lib/src/widgets/single_child_scroll_view.dart
index e735993..3f2dd7d 100644
--- a/packages/flutter/lib/src/widgets/single_child_scroll_view.dart
+++ b/packages/flutter/lib/src/widgets/single_child_scroll_view.dart
@@ -338,8 +338,8 @@
return _SingleChildViewport(
axisDirection: axisDirection,
offset: offset,
- child: contents,
clipBehavior: clipBehavior,
+ child: contents,
);
},
);
diff --git a/packages/flutter/lib/src/widgets/sliver.dart b/packages/flutter/lib/src/widgets/sliver.dart
index f187f47..c70bf7a 100644
--- a/packages/flutter/lib/src/widgets/sliver.dart
+++ b/packages/flutter/lib/src/widgets/sliver.dart
@@ -470,7 +470,7 @@
}
if (addAutomaticKeepAlives)
child = AutomaticKeepAlive(child: child);
- return KeyedSubtree(child: child, key: key);
+ return KeyedSubtree(key: key, child: child);
}
@override
@@ -734,7 +734,7 @@
}
if (addAutomaticKeepAlives)
child = AutomaticKeepAlive(child: child);
- return KeyedSubtree(child: child, key: key);
+ return KeyedSubtree(key: key, child: child);
}
@override
diff --git a/packages/flutter/lib/src/widgets/visibility.dart b/packages/flutter/lib/src/widgets/visibility.dart
index 586dcd8..cfa056e 100644
--- a/packages/flutter/lib/src/widgets/visibility.dart
+++ b/packages/flutter/lib/src/widgets/visibility.dart
@@ -218,9 +218,9 @@
Widget result = child;
if (!maintainInteractivity) {
result = IgnorePointer(
- child: child,
ignoring: !visible,
ignoringSemantics: !visible && !maintainSemantics,
+ child: child,
);
}
return Opacity(
@@ -235,10 +235,10 @@
if (maintainState) {
Widget result = child;
if (!maintainAnimation)
- result = TickerMode(child: child, enabled: visible);
+ result = TickerMode(enabled: visible, child: child);
return Offstage(
- child: result,
offstage: !visible,
+ child: result,
);
}
assert(!maintainAnimation);
@@ -473,7 +473,7 @@
if (maintainState) {
Widget result = sliver;
if (!maintainAnimation)
- result = TickerMode(child: sliver, enabled: visible);
+ result = TickerMode(enabled: visible, child: sliver);
return SliverOffstage(
sliver: result,
offstage: !visible,
diff --git a/packages/flutter/test/cupertino/button_test.dart b/packages/flutter/test/cupertino/button_test.dart
index f8f28fb..e4b51b4 100644
--- a/packages/flutter/test/cupertino/button_test.dart
+++ b/packages/flutter/test/cupertino/button_test.dart
@@ -19,8 +19,8 @@
testWidgets('Default layout minimum size', (WidgetTester tester) async {
await tester.pumpWidget(
boilerplate(child: const CupertinoButton(
- child: Text('X', style: testStyle),
onPressed: null,
+ child: Text('X', style: testStyle),
)),
);
final RenderBox buttonBox = tester.renderObject(find.byType(CupertinoButton));
@@ -35,9 +35,9 @@
const double minSize = 60.0;
await tester.pumpWidget(
boilerplate(child: const CupertinoButton(
- child: Text('X', style: testStyle),
onPressed: null,
minSize: minSize,
+ child: Text('X', style: testStyle),
)),
);
final RenderBox buttonBox = tester.renderObject(find.byType(CupertinoButton));
@@ -51,8 +51,8 @@
testWidgets('Size grows with text', (WidgetTester tester) async {
await tester.pumpWidget(
boilerplate(child: const CupertinoButton(
- child: Text('XXXX', style: testStyle),
onPressed: null,
+ child: Text('XXXX', style: testStyle),
)),
);
final RenderBox buttonBox = tester.renderObject(find.byType(CupertinoButton));
@@ -130,9 +130,9 @@
testWidgets('Button with background is wider', (WidgetTester tester) async {
await tester.pumpWidget(boilerplate(child: const CupertinoButton(
- child: Text('X', style: testStyle),
onPressed: null,
color: Color(0xFFFFFFFF),
+ child: Text('X', style: testStyle),
)));
final RenderBox buttonBox = tester.renderObject(find.byType(CupertinoButton));
expect(
@@ -144,9 +144,9 @@
testWidgets('Custom padding', (WidgetTester tester) async {
await tester.pumpWidget(boilerplate(child: const CupertinoButton(
- child: Text('X', style: testStyle),
onPressed: null,
padding: EdgeInsets.all(100.0),
+ child: Text('X', style: testStyle),
)));
final RenderBox buttonBox = tester.renderObject(find.byType(CupertinoButton));
expect(
@@ -185,8 +185,8 @@
testWidgets("Disabled button doesn't animate", (WidgetTester tester) async {
await tester.pumpWidget(boilerplate(child: const CupertinoButton(
- child: Text('Tap me'),
onPressed: null,
+ child: Text('Tap me'),
)));
expect(SchedulerBinding.instance!.transientCallbackCount, equals(0));
await tester.tap(find.byType(CupertinoButton));
@@ -267,10 +267,10 @@
testWidgets('Can specify colors', (WidgetTester tester) async {
await tester.pumpWidget(boilerplate(child: CupertinoButton(
- child: const Text('Skeuomorph me'),
color: const Color(0x000000FF),
disabledColor: const Color(0x0000FF00),
onPressed: () { },
+ child: const Text('Skeuomorph me'),
)));
BoxDecoration boxDecoration = tester.widget<DecoratedBox>(
@@ -280,10 +280,10 @@
expect(boxDecoration.color, const Color(0x000000FF));
await tester.pumpWidget(boilerplate(child: const CupertinoButton(
- child: Text('Skeuomorph me'),
color: Color(0x000000FF),
disabledColor: Color(0x0000FF00),
onPressed: null,
+ child: Text('Skeuomorph me'),
)));
boxDecoration = tester.widget<DecoratedBox>(
@@ -308,10 +308,10 @@
MediaQuery(
data: const MediaQueryData(platformBrightness: Brightness.dark),
child: boilerplate(child: CupertinoButton(
- child: const Text('Skeuomorph me'),
color: bgColor,
disabledColor: inactive,
onPressed: () { },
+ child: const Text('Skeuomorph me'),
)),
),
);
@@ -326,10 +326,10 @@
MediaQuery(
data: const MediaQueryData(platformBrightness: Brightness.light),
child: boilerplate(child: const CupertinoButton(
- child: Text('Skeuomorph me'),
color: bgColor,
disabledColor: inactive,
onPressed: null,
+ child: Text('Skeuomorph me'),
)),
),
);
diff --git a/packages/flutter/test/cupertino/context_menu_action_test.dart b/packages/flutter/test/cupertino/context_menu_action_test.dart
index 0d0af02..f3d7981 100644
--- a/packages/flutter/test/cupertino/context_menu_action_test.dart
+++ b/packages/flutter/test/cupertino/context_menu_action_test.dart
@@ -17,11 +17,11 @@
final UniqueKey actionKey = UniqueKey();
final CupertinoContextMenuAction action = CupertinoContextMenuAction(
key: actionKey,
- child: const Text('I am a CupertinoContextMenuAction'),
onPressed: onPressed,
trailingIcon: CupertinoIcons.home,
isDestructiveAction: isDestructiveAction,
isDefaultAction: isDefaultAction,
+ child: const Text('I am a CupertinoContextMenuAction'),
);
return CupertinoApp(
diff --git a/packages/flutter/test/cupertino/dialog_test.dart b/packages/flutter/test/cupertino/dialog_test.dart
index 7bec1a3..a70f387 100644
--- a/packages/flutter/test/cupertino/dialog_test.dart
+++ b/packages/flutter/test/cupertino/dialog_test.dart
@@ -127,7 +127,11 @@
title: const Text('The Title'),
content: const Text('Content'),
actions: <Widget>[
- CupertinoDialogAction(child: const Text('Cancel'), isDefaultAction: true, onPressed: () {}),
+ CupertinoDialogAction(
+ isDefaultAction: true,
+ onPressed: () {},
+ child: const Text('Cancel'),
+ ),
const CupertinoDialogAction(child: Text('OK')),
],
),
diff --git a/packages/flutter/test/cupertino/form_section_test.dart b/packages/flutter/test/cupertino/form_section_test.dart
index 6b5af87..2240871 100644
--- a/packages/flutter/test/cupertino/form_section_test.dart
+++ b/packages/flutter/test/cupertino/form_section_test.dart
@@ -123,8 +123,8 @@
child: MediaQuery(
data: const MediaQueryData(),
child: CupertinoFormSection(
- children: <Widget>[CupertinoTextFormFieldRow()],
backgroundColor: backgroundColor,
+ children: <Widget>[CupertinoTextFormFieldRow()],
),
),
),
@@ -142,8 +142,8 @@
CupertinoApp(
home: Center(
child: CupertinoFormSection(
- children: <Widget>[CupertinoTextFormFieldRow()],
clipBehavior: Clip.antiAlias,
+ children: <Widget>[CupertinoTextFormFieldRow()],
),
),
),
diff --git a/packages/flutter/test/cupertino/nav_bar_test.dart b/packages/flutter/test/cupertino/nav_bar_test.dart
index a00bcf3..84c330f 100644
--- a/packages/flutter/test/cupertino/nav_bar_test.dart
+++ b/packages/flutter/test/cupertino/nav_bar_test.dart
@@ -18,8 +18,8 @@
const CupertinoApp(
home: CupertinoNavigationBar(
leading: CupertinoButton(
- child: Text('Something'),
onPressed: null,
+ child: Text('Something'),
),
middle: Text('Title'),
),
@@ -133,7 +133,7 @@
home: Align(
alignment: Alignment.topCenter,
child: CupertinoNavigationBar(
- leading: const CupertinoButton(child: Text('Cheetah'), onPressed: null),
+ leading: const CupertinoButton(onPressed: null, child: Text('Cheetah')),
// Let the box take all the vertical space to test vertical padding but let
// the nav bar position it horizontally.
middle: Align(
@@ -142,7 +142,7 @@
widthFactor: 1.0,
child: const Text('Title'),
),
- trailing: const CupertinoButton(child: Text('Puma'), onPressed: null),
+ trailing: const CupertinoButton(onPressed: null, child: Text('Puma')),
padding: const EdgeInsetsDirectional.only(
start: 10.0,
end: 20.0,
@@ -245,11 +245,11 @@
child: Align(
alignment: Alignment.topCenter,
child: CupertinoNavigationBar(
- leading: CupertinoButton(child: Text('Cheetah'), onPressed: null),
+ leading: CupertinoButton(onPressed: null, child: Text('Cheetah')),
// Let the box take all the vertical space to test vertical padding but let
// the nav bar position it horizontally.
middle: Text('Title'),
- trailing: CupertinoButton(child: Text('Puma'), onPressed: null),
+ trailing: CupertinoButton(onPressed: null, child: Text('Puma')),
padding: EdgeInsetsDirectional.only(
start: 10.0,
end: 20.0,
diff --git a/packages/flutter/test/cupertino/picker_test.dart b/packages/flutter/test/cupertino/picker_test.dart
index df0fd15..1515262 100644
--- a/packages/flutter/test/cupertino/picker_test.dart
+++ b/packages/flutter/test/cupertino/picker_test.dart
@@ -182,9 +182,9 @@
width: 300.0,
child: CupertinoPicker(
itemExtent: 15.0,
- children: const <Widget>[Text('1'), Text('1')],
onSelectedItemChanged: (int i) {},
selectionOverlay: null,
+ children: const <Widget>[Text('1'), Text('1')],
),
),
),
diff --git a/packages/flutter/test/cupertino/scaffold_test.dart b/packages/flutter/test/cupertino/scaffold_test.dart
index 20c3418..e649ede 100644
--- a/packages/flutter/test/cupertino/scaffold_test.dart
+++ b/packages/flutter/test/cupertino/scaffold_test.dart
@@ -420,8 +420,8 @@
await tester.pumpWidget(
const CupertinoApp(
home: CupertinoPageScaffold(
- child: Center(),
backgroundColor: Color(0xFF010203),
+ child: Center(),
),
),
);
diff --git a/packages/flutter/test/cupertino/tab_scaffold_test.dart b/packages/flutter/test/cupertino/tab_scaffold_test.dart
index 5a7d8b3..fd961cf 100644
--- a/packages/flutter/test/cupertino/tab_scaffold_test.dart
+++ b/packages/flutter/test/cupertino/tab_scaffold_test.dart
@@ -58,10 +58,10 @@
tabBar: _buildTabBar(),
tabBuilder: (BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
@@ -248,10 +248,10 @@
controller: controller,
tabBuilder: (BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
@@ -284,10 +284,10 @@
tabBar: _buildTabBar(),
tabBuilder: (BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
@@ -303,10 +303,10 @@
controller: CupertinoTabController(initialIndex: 1), // Programmatically change the tab now.
tabBuilder: (BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
@@ -630,10 +630,10 @@
controller: controller,
tabBuilder: (BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
@@ -652,10 +652,10 @@
controller: controller,
tabBuilder: (BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
@@ -688,10 +688,10 @@
controller: oldController,
tabBuilder: (BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
@@ -710,10 +710,10 @@
tabBuilder:
(BuildContext context, int index) {
return CustomPaint(
- child: Text('Page ${index + 1}'),
painter: TestCallbackPainter(
onPaint: () { tabsPainted.add(index); },
),
+ child: Text('Page ${index + 1}'),
);
},
),
