Migrate more files to use WidgetStateProperty (flutter#174176)

Follow up of flutter#174109

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [ ] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

Author: ValentinVignal

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

@@ -958,7 +958,7 @@ class ListTile extends StatelessWidget {
       if (!enabled || (onTap == null && onLongPress == null)) MaterialState.disabled,
     };
     final MouseCursor effectiveMouseCursor =
-        MaterialStateProperty.resolveAs<MouseCursor?>(mouseCursor, mouseStates) ??
+        WidgetStateProperty.resolveAs<MouseCursor?>(mouseCursor, mouseStates) ??
         tileTheme.mouseCursor?.resolve(mouseStates) ??
         MaterialStateMouseCursor.clickable.resolve(mouseStates);
 
@@ -1136,7 +1136,7 @@ class ListTile extends StatelessWidget {
   }
 }
 
-class _IndividualOverrides extends MaterialStateProperty<Color?> {
+class _IndividualOverrides extends WidgetStateProperty<Color?> {
   _IndividualOverrides({
     this.explicitColor,
     this.enabledColor,
@@ -1152,7 +1152,7 @@ class _IndividualOverrides extends MaterialStateProperty<Color?> {
   @override
   Color? resolve(Set<MaterialState> states) {
     if (explicitColor is MaterialStateColor) {
-      return MaterialStateProperty.resolveAs<Color?>(explicitColor, states);
+      return WidgetStateProperty.resolveAs<Color?>(explicitColor, states);
     }
     if (states.contains(MaterialState.disabled)) {
       return disabledColor;

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

@@ -16,7 +16,6 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
 import 'list_tile.dart';
-import 'material_state.dart';
 import 'theme.dart';
 import 'theme_data.dart';
 
@@ -127,7 +126,7 @@ class ListTileThemeData with Diagnosticable {
   final bool? enableFeedback;
 
   /// If specified, overrides the default value of [ListTile.mouseCursor].
-  final MaterialStateProperty<MouseCursor?>? mouseCursor;
+  final WidgetStateProperty<MouseCursor?>? mouseCursor;
 
   /// If specified, overrides the default value of [ListTile.visualDensity].
   final VisualDensity? visualDensity;
@@ -163,7 +162,7 @@ class ListTileThemeData with Diagnosticable {
     double? minLeadingWidth,
     double? minTileHeight,
     bool? enableFeedback,
-    MaterialStateProperty<MouseCursor?>? mouseCursor,
+    WidgetStateProperty<MouseCursor?>? mouseCursor,
     bool? isThreeLine,
     VisualDensity? visualDensity,
     ListTileTitleAlignment? titleAlignment,
@@ -322,7 +321,7 @@ class ListTileThemeData with Diagnosticable {
     properties.add(DoubleProperty('minTileHeight', minTileHeight, defaultValue: null));
     properties.add(DiagnosticsProperty<bool>('enableFeedback', enableFeedback, defaultValue: null));
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<MouseCursor?>>(
+      DiagnosticsProperty<WidgetStateProperty<MouseCursor?>>(
         'mouseCursor',
         mouseCursor,
         defaultValue: null,
@@ -376,7 +375,7 @@ class ListTileTheme extends InheritedTheme {
     Color? tileColor,
     Color? selectedTileColor,
     bool? enableFeedback,
-    MaterialStateProperty<MouseCursor?>? mouseCursor,
+    WidgetStateProperty<MouseCursor?>? mouseCursor,
     double? horizontalTitleGap,
     double? minVerticalPadding,
     double? minLeadingWidth,
@@ -430,7 +429,7 @@ class ListTileTheme extends InheritedTheme {
   final double? _minVerticalPadding;
   final double? _minLeadingWidth;
   final bool? _enableFeedback;
-  final MaterialStateProperty<MouseCursor?>? _mouseCursor;
+  final WidgetStateProperty<MouseCursor?>? _mouseCursor;
   final ListTileControlAffinity? _controlAffinity;
 
   /// The configuration of this theme.
@@ -579,7 +578,7 @@ class ListTileTheme extends InheritedTheme {
     double? minLeadingWidth,
     double? minTileHeight,
     ListTileTitleAlignment? titleAlignment,
-    MaterialStateProperty<MouseCursor?>? mouseCursor,
+    WidgetStateProperty<MouseCursor?>? mouseCursor,
     VisualDensity? visualDensity,
     ListTileControlAffinity? controlAffinity,
     bool? isThreeLine,

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

@@ -53,7 +53,7 @@ import 'material_state.dart';
 @optionalTypeArgs
 mixin MaterialStateMixin<T extends StatefulWidget> on State<T> {
   /// Managed set of active [MaterialState] values; designed to be passed to
-  /// [MaterialStateProperty.resolve] methods.
+  /// [WidgetStateProperty.resolve] methods.
   ///
   /// To mutate and have [setState] called automatically for you, use
   /// [setMaterialState], [addMaterialState], or [removeMaterialState]. Directly

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

@@ -1521,7 +1521,7 @@ class SubmenuButton extends StatefulWidget {
   /// If this is null, then the value of [MenuThemeData.submenuIcon] is used.
   /// If that is also null, then defaults to a right arrow icon with the size
   /// of 24 pixels.
-  final MaterialStateProperty<Widget?>? submenuIcon;
+  final WidgetStateProperty<Widget?>? submenuIcon;
 
   /// An optional icon to display after the [child].
   final Widget? trailingIcon;
@@ -1907,7 +1907,7 @@ class _SubmenuButtonState extends State<SubmenuButton> {
   }
 
   EdgeInsets _computeMenuPadding(BuildContext context) {
-    final MaterialStateProperty<EdgeInsetsGeometry?> insets =
+    final WidgetStateProperty<EdgeInsetsGeometry?> insets =
         widget.menuStyle?.padding ??
         MenuTheme.of(context).style?.padding ??
         _MenuDefaultsM3(context).padding!;
@@ -3151,7 +3151,7 @@ class _MenuPanelState extends State<_MenuPanel> {
       return getProperty(widgetStyle) ?? getProperty(themeStyle) ?? getProperty(defaultStyle);
     }
 
-    T? resolve<T>(MaterialStateProperty<T>? Function(MenuStyle? style) getProperty) {
+    T? resolve<T>(WidgetStateProperty<T>? Function(MenuStyle? style) getProperty) {
       return effectiveValue((MenuStyle? style) {
         return getProperty(style)?.resolve(<MaterialState>{});
       });
@@ -3314,7 +3314,7 @@ class _Submenu extends StatelessWidget {
       return getProperty(menuStyle) ?? getProperty(themeStyle) ?? getProperty(defaultStyle);
     }
 
-    T? resolve<T>(MaterialStateProperty<T>? Function(MenuStyle? style) getProperty) {
+    T? resolve<T>(WidgetStateProperty<T>? Function(MenuStyle? style) getProperty) {
       return effectiveValue((MenuStyle? style) {
         return getProperty(style)?.resolve(<MaterialState>{});
       });

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

@@ -122,30 +122,30 @@ class MenuStyle with Diagnosticable {
   });
 
   /// The menu's background fill color.
-  final MaterialStateProperty<Color?>? backgroundColor;
+  final WidgetStateProperty<Color?>? backgroundColor;
 
   /// The shadow color of the menu's [Material].
   ///
   /// The material's elevation shadow can be difficult to see for dark themes,
   /// so by default the menu classes add a semi-transparent overlay to indicate
   /// elevation. See [ThemeData.applyElevationOverlayColor].
-  final MaterialStateProperty<Color?>? shadowColor;
+  final WidgetStateProperty<Color?>? shadowColor;
 
   /// The surface tint color of the menu's [Material].
   ///
   /// See [Material.surfaceTintColor] for more details.
-  final MaterialStateProperty<Color?>? surfaceTintColor;
+  final WidgetStateProperty<Color?>? surfaceTintColor;
 
   /// The elevation of the menu's [Material].
-  final MaterialStateProperty<double?>? elevation;
+  final WidgetStateProperty<double?>? elevation;
 
   /// The padding between the menu's boundary and its child.
-  final MaterialStateProperty<EdgeInsetsGeometry?>? padding;
+  final WidgetStateProperty<EdgeInsetsGeometry?>? padding;
 
   /// The minimum size of the menu itself.
   ///
   /// This value must be less than or equal to [maximumSize].
-  final MaterialStateProperty<Size?>? minimumSize;
+  final WidgetStateProperty<Size?>? minimumSize;
 
   /// The menu's size.
   ///
@@ -156,31 +156,31 @@ class MenuStyle with Diagnosticable {
   /// To specify menus with a fixed width and the default height use `fixedSize:
   /// Size.fromWidth(320)`. Similarly, to specify a fixed height and the default
   /// width use `fixedSize: Size.fromHeight(100)`.
-  final MaterialStateProperty<Size?>? fixedSize;
+  final WidgetStateProperty<Size?>? fixedSize;
 
   /// The maximum size of the menu itself.
   ///
   /// A [Size.infinite] or null value for this property means that the menu's
   /// maximum size is not constrained.
   ///
   /// This value must be greater than or equal to [minimumSize].
-  final MaterialStateProperty<Size?>? maximumSize;
+  final WidgetStateProperty<Size?>? maximumSize;
 
   /// The color and weight of the menu's outline.
   ///
   /// This value is combined with [shape] to create a shape decorated with an
   /// outline.
-  final MaterialStateProperty<BorderSide?>? side;
+  final WidgetStateProperty<BorderSide?>? side;
 
   /// The shape of the menu's underlying [Material].
   ///
   /// This shape is combined with [side] to create a shape decorated with an
   /// outline.
-  final MaterialStateProperty<OutlinedBorder?>? shape;
+  final WidgetStateProperty<OutlinedBorder?>? shape;
 
   /// The cursor for a mouse pointer when it enters or is hovering over this
   /// menu's [InkWell].
-  final MaterialStateProperty<MouseCursor?>? mouseCursor;
+  final WidgetStateProperty<MouseCursor?>? mouseCursor;
 
   /// Defines how compact the menu's layout will be.
   ///
@@ -250,17 +250,17 @@ class MenuStyle with Diagnosticable {
   /// Returns a copy of this MenuStyle with the given fields replaced with
   /// the new values.
   MenuStyle copyWith({
-    MaterialStateProperty<Color?>? backgroundColor,
-    MaterialStateProperty<Color?>? shadowColor,
-    MaterialStateProperty<Color?>? surfaceTintColor,
-    MaterialStateProperty<double?>? elevation,
-    MaterialStateProperty<EdgeInsetsGeometry?>? padding,
-    MaterialStateProperty<Size?>? minimumSize,
-    MaterialStateProperty<Size?>? fixedSize,
-    MaterialStateProperty<Size?>? maximumSize,
-    MaterialStateProperty<BorderSide?>? side,
-    MaterialStateProperty<OutlinedBorder?>? shape,
-    MaterialStateProperty<MouseCursor?>? mouseCursor,
+    WidgetStateProperty<Color?>? backgroundColor,
+    WidgetStateProperty<Color?>? shadowColor,
+    WidgetStateProperty<Color?>? surfaceTintColor,
+    WidgetStateProperty<double?>? elevation,
+    WidgetStateProperty<EdgeInsetsGeometry?>? padding,
+    WidgetStateProperty<Size?>? minimumSize,
+    WidgetStateProperty<Size?>? fixedSize,
+    WidgetStateProperty<Size?>? maximumSize,
+    WidgetStateProperty<BorderSide?>? side,
+    WidgetStateProperty<OutlinedBorder?>? shape,
+    WidgetStateProperty<MouseCursor?>? mouseCursor,
     VisualDensity? visualDensity,
     AlignmentGeometry? alignment,
   }) {
@@ -313,41 +313,31 @@ class MenuStyle with Diagnosticable {
       return a;
     }
     return MenuStyle(
-      backgroundColor: MaterialStateProperty.lerp<Color?>(
+      backgroundColor: WidgetStateProperty.lerp<Color?>(
         a?.backgroundColor,
         b?.backgroundColor,
         t,
         Color.lerp,
       ),
-      shadowColor: MaterialStateProperty.lerp<Color?>(
-        a?.shadowColor,
-        b?.shadowColor,
-        t,
-        Color.lerp,
-      ),
-      surfaceTintColor: MaterialStateProperty.lerp<Color?>(
+      shadowColor: WidgetStateProperty.lerp<Color?>(a?.shadowColor, b?.shadowColor, t, Color.lerp),
+      surfaceTintColor: WidgetStateProperty.lerp<Color?>(
         a?.surfaceTintColor,
         b?.surfaceTintColor,
         t,
         Color.lerp,
       ),
-      elevation: MaterialStateProperty.lerp<double?>(a?.elevation, b?.elevation, t, lerpDouble),
-      padding: MaterialStateProperty.lerp<EdgeInsetsGeometry?>(
+      elevation: WidgetStateProperty.lerp<double?>(a?.elevation, b?.elevation, t, lerpDouble),
+      padding: WidgetStateProperty.lerp<EdgeInsetsGeometry?>(
         a?.padding,
         b?.padding,
         t,
         EdgeInsetsGeometry.lerp,
       ),
-      minimumSize: MaterialStateProperty.lerp<Size?>(a?.minimumSize, b?.minimumSize, t, Size.lerp),
-      fixedSize: MaterialStateProperty.lerp<Size?>(a?.fixedSize, b?.fixedSize, t, Size.lerp),
-      maximumSize: MaterialStateProperty.lerp<Size?>(a?.maximumSize, b?.maximumSize, t, Size.lerp),
+      minimumSize: WidgetStateProperty.lerp<Size?>(a?.minimumSize, b?.minimumSize, t, Size.lerp),
+      fixedSize: WidgetStateProperty.lerp<Size?>(a?.fixedSize, b?.fixedSize, t, Size.lerp),
+      maximumSize: WidgetStateProperty.lerp<Size?>(a?.maximumSize, b?.maximumSize, t, Size.lerp),
       side: MaterialStateBorderSide.lerp(a?.side, b?.side, t),
-      shape: MaterialStateProperty.lerp<OutlinedBorder?>(
-        a?.shape,
-        b?.shape,
-        t,
-        OutlinedBorder.lerp,
-      ),
+      shape: WidgetStateProperty.lerp<OutlinedBorder?>(a?.shape, b?.shape, t, OutlinedBorder.lerp),
       mouseCursor: t < 0.5 ? a?.mouseCursor : b?.mouseCursor,
       visualDensity: t < 0.5 ? a?.visualDensity : b?.visualDensity,
       alignment: AlignmentGeometry.lerp(a?.alignment, b?.alignment, t),
@@ -358,69 +348,61 @@ class MenuStyle with Diagnosticable {
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<Color?>>(
+      DiagnosticsProperty<WidgetStateProperty<Color?>>(
         'backgroundColor',
         backgroundColor,
         defaultValue: null,
       ),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<Color?>>(
+      DiagnosticsProperty<WidgetStateProperty<Color?>>(
         'shadowColor',
         shadowColor,
         defaultValue: null,
       ),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<Color?>>(
+      DiagnosticsProperty<WidgetStateProperty<Color?>>(
         'surfaceTintColor',
         surfaceTintColor,
         defaultValue: null,
       ),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<double?>>(
-        'elevation',
-        elevation,
-        defaultValue: null,
-      ),
+      DiagnosticsProperty<WidgetStateProperty<double?>>('elevation', elevation, defaultValue: null),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<EdgeInsetsGeometry?>>(
+      DiagnosticsProperty<WidgetStateProperty<EdgeInsetsGeometry?>>(
         'padding',
         padding,
         defaultValue: null,
       ),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<Size?>>(
+      DiagnosticsProperty<WidgetStateProperty<Size?>>(
         'minimumSize',
         minimumSize,
         defaultValue: null,
       ),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<Size?>>('fixedSize', fixedSize, defaultValue: null),
+      DiagnosticsProperty<WidgetStateProperty<Size?>>('fixedSize', fixedSize, defaultValue: null),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<Size?>>(
+      DiagnosticsProperty<WidgetStateProperty<Size?>>(
         'maximumSize',
         maximumSize,
         defaultValue: null,
       ),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<BorderSide?>>('side', side, defaultValue: null),
+      DiagnosticsProperty<WidgetStateProperty<BorderSide?>>('side', side, defaultValue: null),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<OutlinedBorder?>>(
-        'shape',
-        shape,
-        defaultValue: null,
-      ),
+      DiagnosticsProperty<WidgetStateProperty<OutlinedBorder?>>('shape', shape, defaultValue: null),
     );
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<MouseCursor?>>(
+      DiagnosticsProperty<WidgetStateProperty<MouseCursor?>>(
         'mouseCursor',
         mouseCursor,
         defaultValue: null,

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

@@ -8,7 +8,6 @@ library;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-import 'material_state.dart';
 import 'menu_anchor.dart';
 import 'menu_style.dart';
 import 'theme.dart';
@@ -52,7 +51,7 @@ class MenuThemeData with Diagnosticable {
   ///  * [WidgetState.disabled].
   ///  * [WidgetState.hovered].
   ///  * [WidgetState.focused].
-  final MaterialStateProperty<Widget?>? submenuIcon;
+  final WidgetStateProperty<Widget?>? submenuIcon;
 
   /// Linearly interpolate between two menu button themes.
   static MenuThemeData? lerp(MenuThemeData? a, MenuThemeData? b, double t) {
@@ -84,7 +83,7 @@ class MenuThemeData with Diagnosticable {
     super.debugFillProperties(properties);
     properties.add(DiagnosticsProperty<MenuStyle>('style', style, defaultValue: null));
     properties.add(
-      DiagnosticsProperty<MaterialStateProperty<Widget?>>(
+      DiagnosticsProperty<WidgetStateProperty<Widget?>>(
         'submenuIcon',
         submenuIcon,
         defaultValue: null,