Bumps and fixes for Flutter 3.22

rydmike · May 13, 2024 · 87d3f44 · 87d3f44
1 parent 12dd289
commit 87d3f44
Show file tree

Hide file tree

Showing 15 changed files with 104 additions and 90 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Install Flutter and Dart SDK
         uses: subosito/flutter-action@v2
         with:
-          channel: "stable"
+          channel: "beta"
       - name: Show Dart SDK version
         run: dart --version
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Install Flutter and Dart SDK
         uses: subosito/flutter-action@v2
         with:
-          channel: "stable"
+          channel: "beta"
       - name: Show Dart SDK version
         run: dart --version
 

diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Install Flutter and Dart SDK
         uses: subosito/flutter-action@v2
         with:
-          channel: "stable"
+          channel: "beta"
       - name: Show Dart SDK version
         run: dart --version
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install Flutter and Dart SDK
         uses: subosito/flutter-action@v2
         with:
-          channel: "stable"
+          channel: "beta"
 
       - name: Show Dart SDK version
         run: dart --version

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to the **FlexColorPicker** package are documented in this file.
 
+## 3.5.0-dev.1
+
+**May 13, 2024**
+
+Requires min Flutter 3.22.0 and Dart 3.4.0.
+
+No new features or fixes in this release. A version bump to use FlexSeedScheme 2.0.0 compatible with Flutter version 3.22.0 and its new breaking ColorScheme.
+
+The ColorPicker contains no breaking changes, but underlying Flutter does and this version is only compatible with Flutter 3.22.0 and later.
+
 
 ## 3.4.1
 

diff --git a/example/.fvmrc b/example/.fvmrc
@@ -0,0 +1,4 @@
+{
+  "flutter": "beta",
+  "flavors": {}
+}
diff --git a/example/lib/demo/utils/app.dart b/example/lib/demo/utils/app.dart
@@ -9,14 +9,14 @@ class App {
   // Web demo with inside the app. Shown on the start screen in the demo,
   // so people testing it don't have to ask. Also info for the About screen.
   static const String appName = 'FlexColorPicker';
-  static const String version = '3.4.1';
+  static const String version = '3.5.0-dev.1';
   static const String packageVersion = 'FlexColorPicker package $version';
   static final Uri packageUri = Uri(
     scheme: 'https',
     host: 'pub.dev',
     path: 'packages/flex_color_picker',
   );
-  static const String flutterVersion = 'Channel stable 3.19.3 (canvaskit)';
+  static const String flutterVersion = 'Channel stable 3.22.0 (canvaskit)';
   static const String copyright = '© 2020 - 2024';
   static const String author = 'Mike Rydstrom';
   static const String license = 'BSD 3-Clause License';

diff --git a/example/lib/demo/utils/theme.dart b/example/lib/demo/utils/theme.dart
@@ -82,15 +82,15 @@ class AppTheme {
         style: OutlinedButton.styleFrom(
           padding: roundButtonPadding,
         ).copyWith(
-          side: MaterialStateProperty.resolveWith<BorderSide?>(
-            (Set<MaterialState> states) {
-              if (states.contains(MaterialState.disabled)) {
+          side: WidgetStateProperty.resolveWith<BorderSide?>(
+            (Set<WidgetState> states) {
+              if (states.contains(WidgetState.disabled)) {
                 return BorderSide(
                   color: disabledColor,
                   width: 0.5,
                 );
               }
-              if (states.contains(MaterialState.error)) {
+              if (states.contains(WidgetState.error)) {
                 return BorderSide(
                   color: scheme.error,
                   width: App.outlineThickness,

diff --git a/example/lib/demo/widgets/flex_app_bar.dart b/example/lib/demo/widgets/flex_app_bar.dart
@@ -730,7 +730,7 @@ class FlexAppBar {
     // flag to use it is true OR if the flag to use it on dark, black or white
     // app bars is true and we have dark, black or white color in the app bar.
     final Color schemeSurface = theme.colorScheme.surface;
-    final Color schemeBackground = theme.colorScheme.background;
+    final Color schemeBackground = theme.colorScheme.surface;
     final bool effectiveBottomBorder = hasBorder ||
         (hasBorderOnSurface &&
             (appBarColor == Colors.black ||

diff --git a/example/lib/demo/widgets/switch_list_tile_adaptive.dart b/example/lib/demo/widgets/switch_list_tile_adaptive.dart
@@ -126,11 +126,11 @@ class SwitchListTileAdaptive extends StatelessWidget {
     //     theme.platform == TargetPlatform.macOS) {
     if (theme.useMaterial3) {
       color = theme.switchTheme.thumbColor
-              ?.resolve(<MaterialState>{MaterialState.selected}) ??
+              ?.resolve(<WidgetState>{WidgetState.selected}) ??
           theme.colorScheme.primary;
     } else {
       color = theme.switchTheme.thumbColor
-              ?.resolve(<MaterialState>{MaterialState.selected}) ??
+              ?.resolve(<WidgetState>{WidgetState.selected}) ??
           theme.colorScheme.secondary;
     }
     // }

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
   async:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
+      sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.8.0"
   crypto:
     dependency: transitive
     description:
@@ -119,15 +119,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.4.1"
+    version: "3.5.0-dev.1"
   flex_seed_scheme:
     dependency: transitive
     description:
       name: flex_seed_scheme
-      sha256: "29c12aba221eb8a368a119685371381f8035011d18de5ba277ad11d7dfb8657f"
+      sha256: "116dc56093aa4e64d2f03135957b5ef61b1134a4a4990c66f76bc635903d0d8c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "2.0.0-dev.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -155,10 +155,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -219,26 +219,26 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.7.1"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -267,10 +267,10 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
@@ -315,26 +315,26 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.4"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -536,26 +536,26 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e"
+      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.2.6"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745
+      sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -568,10 +568,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -584,10 +584,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d"
+      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -608,10 +608,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.0"
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:
@@ -632,10 +632,10 @@ packages:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2"
+      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.4.5"
   webkit_inspection_protocol:
     dependency: transitive
     description:
@@ -648,10 +648,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -670,4 +670,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.2"
+  flutter: ">=3.22.0-0.3.pre"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,10 +1,10 @@
 name: color_picker_example
 description: Two examples of how to use the FlexColorPicker package.
-version: 3.4.1
+version: 3.5.0-dev.1
 publish_to: 'none'
 environment:
   sdk: '>=2.19.0 <4.0.0'
-  flutter: '>=3.19.0'
+  flutter: '>=3.22.0-0.3.pre'
 
 dependencies:
   # https://pub.dev/packages/flex_color_picker
@@ -24,11 +24,11 @@ dependencies:
   hive: ^2.2.3
 
   # https://pub.dev/packages/path_provider:
-  path_provider: ^2.1.2
+  path_provider: ^2.1.3
 
   # https://pub.dev/packages/url_launcher
   # Used for launching a WEB URL (by Google flutter.dev).
-  url_launcher: ^6.2.5
+  url_launcher: ^6.2.6
 
 dev_dependencies:
   flutter_test:

diff --git a/lib/src/color_wheel_picker.dart b/lib/src/color_wheel_picker.dart
@@ -380,7 +380,7 @@ class _ColorWheelPickerState extends State<ColorWheelPicker> {
         child: Focus(
           focusNode: _focusNode,
           child: MouseRegion(
-            cursor: MaterialStateMouseCursor.clickable,
+            cursor: WidgetStateMouseCursor.clickable,
             child: Stack(
               fit: StackFit.expand,
               children: <Widget>[