Merge branch 'dev' into macos_switch

# Conflicts: # pubspec.lock # pubspec.yaml
macosui · Jul 3, 2023 · 2005536 · 2005536
2 parents fbc19fa + a56544a
commit 2005536
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 126 deletions.
diff --git a/.github/workflows/dart_code_metrics.yaml b/.github/workflows/dart_code_metrics.yaml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Run Dart Code Metrics
-        uses: dart-code-checker/dart-code-metrics-action@v3
+        uses: dart-code-checker/dart-code-metrics-action@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pull_request_comment: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
   * Some visual artifacts that occurred while the window was being (de)miniaturized (such as the application's shadow going missing) no longer occur.
   * The sidebar remains transparent when the app's brightness setting mismatches the OS setting.
   * Wallpaper tinting is now supported.
+* Support Flutter 3.10 and Dart 3
 
 To migrate an existing application, please refer to the “Modern window look” section in the README.
 

diff --git a/example/lib/pages/fields_page.dart b/example/lib/pages/fields_page.dart
@@ -352,8 +352,8 @@ const countries = [
 var actionResults = [
   SearchResultItem(
     'Build project',
-    child: Row(
-      children: const [
+    child: const Row(
+      children: [
         Padding(
           padding: EdgeInsets.symmetric(horizontal: 8.0),
           child: MacosIcon(CupertinoIcons.hammer),
@@ -365,8 +365,8 @@ var actionResults = [
   ),
   SearchResultItem(
     'Debug project',
-    child: Row(
-      children: const [
+    child: const Row(
+      children: [
         Padding(
           padding: EdgeInsets.symmetric(horizontal: 8.0),
           child: MacosIcon(CupertinoIcons.tickets),
@@ -378,8 +378,8 @@ var actionResults = [
   ),
   SearchResultItem(
     'Open containing folder',
-    child: Row(
-      children: const [
+    child: const Row(
+      children: [
         Padding(
           padding: EdgeInsets.symmetric(horizontal: 8.0),
           child: MacosIcon(CupertinoIcons.folder),

diff --git a/example/lib/pages/toolbar_page.dart b/example/lib/pages/toolbar_page.dart
@@ -160,9 +160,9 @@ class _ToolbarPageState extends State<ToolbarPage> {
             return SingleChildScrollView(
               controller: scrollController,
               padding: const EdgeInsets.all(30),
-              child: Center(
+              child: const Center(
                 child: Column(
-                  children: const [
+                  children: [
                     Text(
                       'A toolbar provides convenient access to frequently used commands and controls that perform actions relevant to the current view.',
                       textAlign: TextAlign.center,

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -79,18 +79,18 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      sha256: "6b0206b0bf4f04961fc5438198ccb3a885685cd67d4d4a32cc20ad7f8adbe015"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   macos_ui:
     dependency: "direct main"
     description:
@@ -102,18 +102,18 @@ packages:
     dependency: transitive
     description:
       name: macos_window_utils
-      sha256: "510de576b5432dd9ef9e4c258abcc021c6dfbb17a78a344688848a6784b352b8"
+      sha256: b78a210aa70ca7ccad6e7b7b810fb4689c507f4a46e299214900b2a1eb70ea23
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
@@ -126,10 +126,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   nested:
     dependency: transitive
     description:
@@ -142,10 +142,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   provider:
     dependency: "direct main"
     description:
@@ -203,10 +203,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
   vector_math:
     dependency: transitive
     description:
@@ -216,5 +216,5 @@ packages:
     source: hosted
     version: "2.1.4"
 sdks:
-  dart: ">=2.18.5 <3.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
diff --git a/lib/src/fields/text_field.dart b/lib/src/fields/text_field.dart
@@ -105,7 +105,7 @@ class _TextFieldSelectionGestureDetectorBuilder
   final _MacosTextFieldState _state;
 
   @override
-  void onSingleTapUp(TapUpDetails details) {
+  void onSingleTapUp(TapDragUpDetails details) {
     // Because TextSelectionGestureDetector listens to taps that happen on
     // widgets in front of it, tapping the clear button will also trigger
     // this handler. If the clear button widget recognizes the up event,
@@ -124,11 +124,14 @@ class _TextFieldSelectionGestureDetectorBuilder
     }
     _state._requestKeyboard();
     if (_state.widget.onTap != null) _state.widget.onTap!();
+
+    super.onSingleTapUp(details);
   }
 
   @override
-  void onDragSelectionEnd(DragEndDetails details) {
+  void onDragSelectionEnd(TapDragEndDetails details) {
     _state._requestKeyboard();
+    super.onDragSelectionEnd(details);
   }
 }
 
@@ -756,7 +759,7 @@ class MacosTextField extends StatefulWidget {
       'clearButtonMode',
       clearButtonMode,
     ));
-    properties.add(EnumProperty<TextInputType>(
+    properties.add(DiagnosticsProperty<TextInputType>(
       'keyboardType',
       keyboardType,
       defaultValue: TextInputType.text,

diff --git a/lib/src/layout/scaffold.dart b/lib/src/layout/scaffold.dart
@@ -113,7 +113,7 @@ class _MacosScaffoldState extends State<MacosScaffold> {
 }
 
 class _ScaffoldBody extends MultiChildRenderObjectWidget {
-  _ScaffoldBody({
+  const _ScaffoldBody({
     super.children,
   });