chore: fix analysis issues for flutter 3.1.3 (#376)

Co-authored-by: Remon Helmond <remon.helmond@hypervolt.co.uk>

chore: fix analysis issues for flutter 3.1.3 (#376)
Co-authored-by: Remon Helmond <remon.helmond@hypervolt.co.uk>
Rémon · GitHub
Commit d89711deb8f5e5c976ec23585551125700e4a80a d89711de 1 parent 6a5816d9
Showing 6 changed files with 81 additions and 58 deletions
sheet/example/lib/examples/sheet/complex_snap_sheet.dart
sheet/example/pubspec.lock
sheet/lib/src/physics.dart
sheet/pubspec.lock
sheet/test/screen_size_test.dart
sheet/test/src/physics_test.dart
--- a/sheet/example/lib/examples/sheet/complex_snap_sheet.dart
View file @d89711d
+++ b/sheet/example/lib/examples/sheet/complex_snap_sheet.dart
View file @d89711d
@@ -70,7 +70,7 @@ class _AdvancedSnapSheetPageState extends State<AdvancedSnapSheetPage>
   }
 }
-class MapAppBar extends StatefulWidget with PreferredSizeWidget {
+class MapAppBar extends StatefulWidget implements PreferredSizeWidget {
   const MapAppBar({Key? key, required this.controller}) : super(key: key);
   final SheetController controller;
   @override
--- a/sheet/example/pubspec.lock
View file @d89711d
+++ b/sheet/example/pubspec.lock
View file @d89711d
@@ -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: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -88,14 +88,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.5.1"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.5"
   logging:
     dependency: transitive
     description:
@@ -108,26 +100,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     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:
@@ -140,10 +132,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:
@@ -158,7 +150,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.4+1"
+    version: "1.0.0-pre"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -168,10 +160,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -208,10 +200,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.6.0"
   vector_math:
     dependency: transitive
     description:
@@ -220,6 +212,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
 sdks:
-  dart: ">=2.18.0 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.7.0"
--- a/sheet/lib/src/physics.dart
View file @d89711d
+++ b/sheet/lib/src/physics.dart
View file @d89711d
@@ -169,7 +169,7 @@ class BouncingSheetPhysics extends ScrollPhysics with SheetPhysics {
   @override
   Simulation? createBallisticSimulation(
       ScrollMetrics position, double velocity) {
-    final Tolerance tolerance = this.tolerance;
+    final Tolerance tolerance = toleranceFor(position);
     if (position.outOfRange) {
       return BouncingScrollSimulation(
         spring: const SpringDescription(
@@ -266,7 +266,7 @@ class NoMomentumSheetPhysics extends ScrollPhysics with SheetPhysics {
   @override
   Simulation? createBallisticSimulation(
       ScrollMetrics position, double velocity) {
-    final Tolerance tolerance = this.tolerance;
+    final Tolerance tolerance = toleranceFor(position);
     if (position.outOfRange) {
       double? end;
       if (position.pixels > position.maxScrollExtent) {
@@ -336,7 +336,7 @@ class ClampingSheetPhysics extends ScrollPhysics with SheetPhysics {
   @override
   Simulation? createBallisticSimulation(
       ScrollMetrics position, double velocity) {
-    final Tolerance tolerance = this.tolerance;
+    final Tolerance tolerance = toleranceFor(position);
     if (position.outOfRange) {
       double? end;
       if (position.pixels > position.maxScrollExtent) {
@@ -443,7 +443,7 @@ class SnapSheetPhysics extends ScrollPhysics with SheetPhysics {
     // if ((velocity <= 0.0 && position.pixels <= position.minScrollExtent) ||
     //     (velocity >= 0.0 && position.pixels >= position.maxScrollExtent))
     //   return super.createBallisticSimulation(position, velocity);
-    final Tolerance tolerance = this.tolerance;
+    final Tolerance tolerance = toleranceFor(position);
     final double target = _getTargetPixels(position, tolerance, velocity);
     if (target != position.pixels) {
       return ScrollSpringSimulation(
--- a/sheet/pubspec.lock
View file @d89711d
+++ b/sheet/pubspec.lock
View file @d89711d
@@ -29,10 +29,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:
@@ -45,10 +45,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:
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.2"
   convert:
     dependency: transitive
     description:
@@ -183,26 +183,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   mime:
     dependency: transitive
     description:
@@ -239,10 +239,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"
   pool:
     dependency: transitive
     description:
@@ -316,10 +316,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -356,26 +356,26 @@ packages:
     dependency: transitive
     description:
       name: test
-      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
+      sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
       url: "https://pub.dev"
     source: hosted
-    version: "1.22.0"
+    version: "1.24.3"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.6.0"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
+      sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.20"
+    version: "0.5.3"
   typed_data:
     dependency: transitive
     description:
@@ -408,6 +408,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
   web_socket_channel:
     dependency: transitive
     description:
@@ -433,5 +441,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.0 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.7.0"
--- a/sheet/test/screen_size_test.dart
View file @d89711d
+++ b/sheet/test/screen_size_test.dart
View file @d89711d
@@ -9,8 +9,9 @@ const Rect kScreenRect = Rect.fromLTRB(0, 0, kScreenWidth, kScreenHeight);
 void main() {
   testWidgets('defaultTestSize', (WidgetTester tester) async {
-    final Size testSize = tester.binding.window.physicalSize /
-        tester.binding.window.devicePixelRatio;
+    final Size testSize =
+        tester.view.physicalSize / tester.view.devicePixelRatio;
+
     expect(testSize, equals(kScreenSize));
   });
 }
--- a/sheet/test/src/physics_test.dart
View file @d89711d
+++ b/sheet/test/src/physics_test.dart
View file @d89711d
@@ -77,6 +77,7 @@ void main() {
       test('overscroll is progressively harder', () {
         final ScrollMetrics lessOverscrolledPosition = FixedScrollMetrics(
+          devicePixelRatio: 1,
           minScrollExtent: 0.0,
           maxScrollExtent: 1000.0,
           pixels: -20.0,
@@ -86,6 +87,7 @@ void main() {
         final ScrollMetrics moreOverscrolledPosition = FixedScrollMetrics(
           minScrollExtent: 0.0,
+          devicePixelRatio: 1,
           maxScrollExtent: 1000.0,
           pixels: -40.0,
           viewportDimension: 100.0,
@@ -114,6 +116,7 @@ void main() {
       test('easing an overscroll still has resistance', () {
         final ScrollMetrics overscrolledPosition = FixedScrollMetrics(
           minScrollExtent: 0.0,
+          devicePixelRatio: 1,
           maxScrollExtent: 1000.0,
           pixels: -20.0,
           viewportDimension: 100.0,
@@ -131,6 +134,7 @@ void main() {
         final ScrollMetrics scrollPosition = FixedScrollMetrics(
           minScrollExtent: 0.0,
           maxScrollExtent: 1000.0,
+          devicePixelRatio: 1,
           pixels: 300.0,
           viewportDimension: 100.0,
           axisDirection: AxisDirection.down,
@@ -150,6 +154,7 @@ void main() {
         final ScrollMetrics overscrolledPosition = FixedScrollMetrics(
           minScrollExtent: 0.0,
           maxScrollExtent: 1000.0,
+          devicePixelRatio: 1,
           pixels: -20.0,
           viewportDimension: 100.0,
           axisDirection: AxisDirection.down,
@@ -168,12 +173,14 @@ void main() {
           minScrollExtent: 0.0,
           maxScrollExtent: 10.0,
           pixels: -20.0,
+          devicePixelRatio: 1,
           viewportDimension: 100.0,
           axisDirection: AxisDirection.down,
         );
         final ScrollMetrics bigListOverscrolledPosition = FixedScrollMetrics(
           minScrollExtent: 0.0,
+          devicePixelRatio: 1,
           maxScrollExtent: 1000.0,
           pixels: -20.0,
           viewportDimension: 100.0,
@@ -199,6 +206,7 @@ void main() {
           final ScrollMetrics scrollMetrics = FixedScrollMetrics(
             minScrollExtent: 0.0,
             maxScrollExtent: 200.0,
+            devicePixelRatio: 1,
             pixels: 10.0,
             viewportDimension: 100.0,
             axisDirection: AxisDirection.down,
@@ -217,6 +225,7 @@ void main() {
             final ScrollMetrics scrollMetrics = FixedScrollMetrics(
               minScrollExtent: 0.0,
               maxScrollExtent: 200.0,
+              devicePixelRatio: 1,
               pixels: 120.0,
               viewportDimension: 100.0,
               axisDirection: AxisDirection.down,
@@ -237,6 +246,7 @@ void main() {
             final ScrollMetrics scrollMetrics = FixedScrollMetrics(
               minScrollExtent: 0.0,
               maxScrollExtent: 200.0,
+              devicePixelRatio: 1,
               pixels: -10.0,
               viewportDimension: 100.0,
               axisDirection: AxisDirection.down,
@@ -258,6 +268,7 @@ void main() {
           final ScrollMetrics scrollMetrics = FixedScrollMetrics(
             minScrollExtent: 0.0,
             maxScrollExtent: 200.0,
+            devicePixelRatio: 1,
             pixels: 120.0,
             viewportDimension: 100.0,
             axisDirection: AxisDirection.down,
@@ -275,6 +286,7 @@ void main() {
           final ScrollMetrics scrollMetrics = FixedScrollMetrics(
             minScrollExtent: 0.0,
             maxScrollExtent: 200.0,
+            devicePixelRatio: 1,
             pixels: -10.0,
             viewportDimension: 100.0,
             axisDirection: AxisDirection.down,
@@ -303,6 +315,7 @@ void main() {
           final ScrollMetrics scrollMetrics = FixedScrollMetrics(
             minScrollExtent: 0.0,
             maxScrollExtent: 200.0,
+            devicePixelRatio: 1,
             pixels: 120.0,
             viewportDimension: 100.0,
             axisDirection: AxisDirection.down,
@@ -320,6 +333,7 @@ void main() {
           final ScrollMetrics scrollMetrics = FixedScrollMetrics(
             minScrollExtent: 0.0,
             maxScrollExtent: 200.0,
+            devicePixelRatio: 1,
             pixels: -10.0,
             viewportDimension: 100.0,
             axisDirection: AxisDirection.down,