Migrate MaterialStateProperty to WidgetStateProperty

flutter · May 15, 2024 · 8b68daa · 8b68daa
1 parent 87a02e3
commit 8b68daa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/flutter_adaptive_scaffold/example/lib/main.dart b/packages/flutter_adaptive_scaffold/example/lib/main.dart
@@ -863,14 +863,14 @@ class _EmailTile extends StatelessWidget {
                     child: OutlinedButton(
                       onPressed: () {},
                       style: ButtonStyle(
-                        shape: MaterialStateProperty.all(
+                        shape: WidgetStateProperty.all(
                           RoundedRectangleBorder(
                               borderRadius: BorderRadius.circular(30.0)),
                         ),
-                        backgroundColor: MaterialStateProperty.all<Color>(
+                        backgroundColor: WidgetStateProperty.all<Color>(
                           const Color.fromARGB(255, 245, 241, 248),
                         ),
-                        side: MaterialStateProperty.all(
+                        side: WidgetStateProperty.all(
                           const BorderSide(
                               width: 0.0, color: Colors.transparent),
                         ),
@@ -885,14 +885,14 @@ class _EmailTile extends StatelessWidget {
                     child: OutlinedButton(
                       onPressed: () {},
                       style: ButtonStyle(
-                        shape: MaterialStateProperty.all(
+                        shape: WidgetStateProperty.all(
                           RoundedRectangleBorder(
                               borderRadius: BorderRadius.circular(30.0)),
                         ),
-                        backgroundColor: MaterialStateProperty.all<Color>(
+                        backgroundColor: WidgetStateProperty.all<Color>(
                           const Color.fromARGB(255, 245, 241, 248),
                         ),
-                        side: MaterialStateProperty.all(
+                        side: WidgetStateProperty.all(
                           const BorderSide(
                               width: 0.0, color: Colors.transparent),
                         ),

diff --git a/packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart b/packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart
@@ -338,8 +338,8 @@ class AdaptiveScaffold extends StatefulWidget {
             NavigationBarTheme.of(context);
         return NavigationBarTheme(
           data: currentNavBarTheme.copyWith(
-            iconTheme: MaterialStateProperty.resolveWith(
-              (Set<MaterialState> states) {
+            iconTheme: WidgetStateProperty.resolveWith(
+              (Set<WidgetState> states) {
                 return currentNavBarTheme.iconTheme
                         ?.resolve(states)
                         ?.copyWith(size: iconSize) ??

diff --git a/packages/rfw/lib/src/flutter/material_widgets.dart b/packages/rfw/lib/src/flutter/material_widgets.dart
@@ -77,7 +77,7 @@ import 'runtime.dart';
 ///  * Theming in general is not currently supported.
 ///
 ///  * Properties whose values are [Animation]s or based on
-///    [MaterialStateProperty] are not supported.
+///    [WidgetStateProperty] are not supported.
 ///
 ///  * Features related to focus or configuring mouse support are not
 ///    implemented.
@@ -94,7 +94,7 @@ import 'runtime.dart';
 ///
 /// In general, the trend will all of these unsupported features is that this
 /// library doesn't support features that can't be trivially expressed using the
-/// JSON-like structures of RFW. For example, [MaterialStateProperty] is
+/// JSON-like structures of RFW. For example, [WidgetStateProperty] is
 /// designed to be used with code to select the values, which doesn't work well
 /// in the RFW structure.
 LocalWidgetLibrary createMaterialWidgets() => LocalWidgetLibrary(_materialWidgetsDefinitions);