Remove deprecated kind in GestureRecognizer et al (#119572)
* Remove deprecated kind in GestureRecognizer et al
* Fix null case
diff --git a/packages/flutter/lib/src/gestures/eager.dart b/packages/flutter/lib/src/gestures/eager.dart
index 76d2b30..7601c76 100644
--- a/packages/flutter/lib/src/gestures/eager.dart
+++ b/packages/flutter/lib/src/gestures/eager.dart
@@ -18,11 +18,6 @@
///
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
EagerGestureRecognizer({
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
diff --git a/packages/flutter/lib/src/gestures/force_press.dart b/packages/flutter/lib/src/gestures/force_press.dart
index f2eccfd..dc0d19f 100644
--- a/packages/flutter/lib/src/gestures/force_press.dart
+++ b/packages/flutter/lib/src/gestures/force_press.dart
@@ -125,11 +125,6 @@
this.peakPressure = 0.85,
this.interpolation = _inverseLerp,
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
}) : assert(peakPressure > startPressure);
diff --git a/packages/flutter/lib/src/gestures/long_press.dart b/packages/flutter/lib/src/gestures/long_press.dart
index d3a8b6c..5989d93 100644
--- a/packages/flutter/lib/src/gestures/long_press.dart
+++ b/packages/flutter/lib/src/gestures/long_press.dart
@@ -248,11 +248,6 @@
LongPressGestureRecognizer({
Duration? duration,
super.postAcceptSlopTolerance = null,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.debugOwner,
super.allowedButtonsFilter = _defaultButtonAcceptBehavior,
diff --git a/packages/flutter/lib/src/gestures/monodrag.dart b/packages/flutter/lib/src/gestures/monodrag.dart
index b8f64e0..08082c8 100644
--- a/packages/flutter/lib/src/gestures/monodrag.dart
+++ b/packages/flutter/lib/src/gestures/monodrag.dart
@@ -75,11 +75,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
DragGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
this.dragStartBehavior = DragStartBehavior.start,
this.velocityTrackerBuilder = _defaultBuilder,
super.supportedDevices,
@@ -554,11 +549,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
VerticalDragGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
@@ -601,11 +591,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
HorizontalDragGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
diff --git a/packages/flutter/lib/src/gestures/multidrag.dart b/packages/flutter/lib/src/gestures/multidrag.dart
index 3c8e51f..1b3347c 100644
--- a/packages/flutter/lib/src/gestures/multidrag.dart
+++ b/packages/flutter/lib/src/gestures/multidrag.dart
@@ -215,11 +215,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
MultiDragGestureRecognizer({
required super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter = _defaultButtonAcceptBehavior,
});
@@ -371,11 +366,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
ImmediateMultiDragGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
@@ -429,11 +419,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
HorizontalMultiDragGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
@@ -487,11 +472,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
VerticalMultiDragGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
@@ -597,11 +577,6 @@
DelayedMultiDragGestureRecognizer({
this.delay = kLongPressTimeout,
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
diff --git a/packages/flutter/lib/src/gestures/multitap.dart b/packages/flutter/lib/src/gestures/multitap.dart
index 9721ebe..5d9e5bc 100644
--- a/packages/flutter/lib/src/gestures/multitap.dart
+++ b/packages/flutter/lib/src/gestures/multitap.dart
@@ -118,11 +118,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
DoubleTapGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter = _defaultButtonAcceptBehavior,
});
@@ -486,11 +481,6 @@
MultiTapGestureRecognizer({
this.longTapDelay = Duration.zero,
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
diff --git a/packages/flutter/lib/src/gestures/recognizer.dart b/packages/flutter/lib/src/gestures/recognizer.dart
index 8a2dc11..6fc9e39 100644
--- a/packages/flutter/lib/src/gestures/recognizer.dart
+++ b/packages/flutter/lib/src/gestures/recognizer.dart
@@ -78,15 +78,9 @@
/// {@endtemplate}
GestureRecognizer({
this.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- PointerDeviceKind? kind,
Set<PointerDeviceKind>? supportedDevices,
AllowedButtonsFilter? allowedButtonsFilter,
- }) : assert(kind == null || supportedDevices == null),
- _supportedDevices = kind == null ? supportedDevices : <PointerDeviceKind>{ kind },
+ }) : _supportedDevices = supportedDevices,
_allowedButtonsFilter = allowedButtonsFilter ?? _defaultButtonAcceptBehavior;
/// The recognizer's owner.
@@ -321,11 +315,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
OneSequenceGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
});
@@ -535,11 +524,6 @@
this.preAcceptSlopTolerance = kTouchSlop,
this.postAcceptSlopTolerance = kTouchSlop,
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
}) : assert(
diff --git a/packages/flutter/lib/src/gestures/scale.dart b/packages/flutter/lib/src/gestures/scale.dart
index 16421c0..dddfa71 100644
--- a/packages/flutter/lib/src/gestures/scale.dart
+++ b/packages/flutter/lib/src/gestures/scale.dart
@@ -321,11 +321,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
ScaleGestureRecognizer({
super.debugOwner,
- @Deprecated(
- 'Migrate to supportedDevices. '
- 'This feature was deprecated after v2.3.0-1.0.pre.',
- )
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
this.dragStartBehavior = DragStartBehavior.down,
diff --git a/packages/flutter/lib/src/widgets/tap_and_drag_gestures.dart b/packages/flutter/lib/src/widgets/tap_and_drag_gestures.dart
index 348bd86..6a635cb 100644
--- a/packages/flutter/lib/src/widgets/tap_and_drag_gestures.dart
+++ b/packages/flutter/lib/src/widgets/tap_and_drag_gestures.dart
@@ -697,7 +697,6 @@
/// {@macro flutter.gestures.GestureRecognizer.supportedDevices}
TapAndDragGestureRecognizer({
super.debugOwner,
- super.kind,
super.supportedDevices,
super.allowedButtonsFilter,
}) : _deadline = kPressTimeout,
diff --git a/packages/flutter/test/gestures/drag_test.dart b/packages/flutter/test/gestures/drag_test.dart
index 829f684..8723bf9 100644
--- a/packages/flutter/test/gestures/drag_test.dart
+++ b/packages/flutter/test/gestures/drag_test.dart
@@ -730,7 +730,7 @@
testGesture('Can filter drags based on device kind', (GestureTester tester) {
final HorizontalDragGestureRecognizer drag =
HorizontalDragGestureRecognizer(
- kind: PointerDeviceKind.mouse,
+ supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.mouse },
)
..dragStartBehavior = DragStartBehavior.down;
addTearDown(drag.dispose);
diff --git a/packages/flutter/test/gestures/force_press_test.dart b/packages/flutter/test/gestures/force_press_test.dart
index 1f780d8..710b9f8 100644
--- a/packages/flutter/test/gestures/force_press_test.dart
+++ b/packages/flutter/test/gestures/force_press_test.dart
@@ -574,19 +574,4 @@
expect(updated, 1);
expect(ended, 1);
});
-
- testWidgets('ForecePressGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- ForcePressGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
}
diff --git a/packages/flutter/test/gestures/long_press_test.dart b/packages/flutter/test/gestures/long_press_test.dart
index 70a40fb..4de0cb4 100644
--- a/packages/flutter/test/gestures/long_press_test.dart
+++ b/packages/flutter/test/gestures/long_press_test.dart
@@ -259,7 +259,9 @@
});
testGesture('non-allowed pointer does not inadvertently reset the recognizer', (GestureTester tester) {
- gesture = LongPressGestureRecognizer(kind: PointerDeviceKind.touch);
+ gesture = LongPressGestureRecognizer(
+ supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
+ );
setUpHandlers();
// Accept a long-press gesture
@@ -495,7 +497,9 @@
});
testGesture('Can filter long press based on device kind', (GestureTester tester) {
- final LongPressGestureRecognizer mouseLongPress = LongPressGestureRecognizer(kind: PointerDeviceKind.mouse);
+ final LongPressGestureRecognizer mouseLongPress = LongPressGestureRecognizer(
+ supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.mouse },
+ );
bool mouseLongPressDown = false;
mouseLongPress.onLongPress = () {
@@ -697,19 +701,4 @@
longPress.dispose();
recognized.clear();
});
-
- testWidgets('LongPressGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- LongPressGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
}
diff --git a/packages/flutter/test/gestures/monodrag_test.dart b/packages/flutter/test/gestures/monodrag_test.dart
index 06864e9..eaf5b6d 100644
--- a/packages/flutter/test/gestures/monodrag_test.dart
+++ b/packages/flutter/test/gestures/monodrag_test.dart
@@ -49,36 +49,6 @@
GestureBinding.instance.handleEvent(up91, HitTestEntry(MockHitTestTarget()));
});
- testWidgets('VerticalDragGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- VerticalDragGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
-
- testWidgets('HorizontalDragGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- HorizontalDragGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
-
group('Recognizers on different button filters:', () {
final List<String> recognized = <String>[];
late HorizontalDragGestureRecognizer primaryRecognizer;
diff --git a/packages/flutter/test/gestures/multidrag_test.dart b/packages/flutter/test/gestures/multidrag_test.dart
index 5619200..a4ebd91 100644
--- a/packages/flutter/test/gestures/multidrag_test.dart
+++ b/packages/flutter/test/gestures/multidrag_test.dart
@@ -63,8 +63,9 @@
});
testGesture('MultiDrag: can filter based on device kind', (GestureTester tester) {
- final DelayedMultiDragGestureRecognizer drag =
- DelayedMultiDragGestureRecognizer(kind: PointerDeviceKind.touch);
+ final DelayedMultiDragGestureRecognizer drag = DelayedMultiDragGestureRecognizer(
+ supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
+ );
bool didStartDrag = false;
drag.onStart = (Offset position) {
@@ -89,61 +90,4 @@
expect(didStartDrag, isFalse);
drag.dispose();
});
-
- testWidgets('ImmediateMultiGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- try {
- ImmediateMultiDragGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- } catch(error) {
- expect(error, isAssertionError);
- expect(error.toString(), contains('kind == null || supportedDevices == null'));
- }
- });
-
- testWidgets('HorizontalMultiDragGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- HorizontalMultiDragGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
-
- testWidgets('VerticalMultiDragGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- VerticalMultiDragGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
-
- testWidgets('DelayedMultiDragGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- DelayedMultiDragGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
}
diff --git a/packages/flutter/test/gestures/multitap_test.dart b/packages/flutter/test/gestures/multitap_test.dart
index 1798766..2302745 100644
--- a/packages/flutter/test/gestures/multitap_test.dart
+++ b/packages/flutter/test/gestures/multitap_test.dart
@@ -68,11 +68,10 @@
});
testGesture('Can filter based on device kind', (GestureTester tester) {
- final MultiTapGestureRecognizer tap =
- MultiTapGestureRecognizer(
- longTapDelay: kLongPressTimeout,
- kind: PointerDeviceKind.touch,
- );
+ final MultiTapGestureRecognizer tap = MultiTapGestureRecognizer(
+ longTapDelay: kLongPressTimeout,
+ supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
+ );
final List<String> log = <String>[];
@@ -143,34 +142,4 @@
tap.dispose();
});
-
- testWidgets('DoubleTapGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- DoubleTapGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
-
- testWidgets('MultiTapGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- MultiTapGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
}
diff --git a/packages/flutter/test/gestures/recognizer_test.dart b/packages/flutter/test/gestures/recognizer_test.dart
index c1f467e..36fb036 100644
--- a/packages/flutter/test/gestures/recognizer_test.dart
+++ b/packages/flutter/test/gestures/recognizer_test.dart
@@ -72,21 +72,6 @@
expect(difference.global, const Offset(40, 40));
});
- testWidgets('EagerGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- EagerGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
-
group('PrimaryPointerGestureRecognizer', () {
testGesture('cleans up state after winning arena', (GestureTester tester) {
final List<String> resolutions = <String>[];
diff --git a/packages/flutter/test/gestures/scale_test.dart b/packages/flutter/test/gestures/scale_test.dart
index 471f17c..a844c54 100644
--- a/packages/flutter/test/gestures/scale_test.dart
+++ b/packages/flutter/test/gestures/scale_test.dart
@@ -250,7 +250,9 @@
});
testGesture('Rejects scale gestures from unallowed device kinds', (GestureTester tester) {
- final ScaleGestureRecognizer scale = ScaleGestureRecognizer(kind: PointerDeviceKind.touch);
+ final ScaleGestureRecognizer scale = ScaleGestureRecognizer(
+ supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
+ );
bool didStartScale = false;
scale.onStart = (ScaleStartDetails details) {
@@ -282,7 +284,9 @@
});
testGesture('Scale gestures starting from allowed device kinds cannot be ended from unallowed devices', (GestureTester tester) {
- final ScaleGestureRecognizer scale = ScaleGestureRecognizer(kind: PointerDeviceKind.touch);
+ final ScaleGestureRecognizer scale = ScaleGestureRecognizer(
+ supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
+ );
bool didStartScale = false;
Offset? updatedFocalPoint;
@@ -1159,21 +1163,6 @@
scale.dispose();
});
- testWidgets('ScaleGestureRecognizer asserts when kind and supportedDevices are both set', (WidgetTester tester) async {
- expect(
- () {
- ScaleGestureRecognizer(
- kind: PointerDeviceKind.touch,
- supportedDevices: <PointerDeviceKind>{ PointerDeviceKind.touch },
- );
- },
- throwsA(
- isA<AssertionError>().having((AssertionError error) => error.toString(),
- 'description', contains('kind == null || supportedDevices == null')),
- ),
- );
- });
-
testGesture('scale trackpadScrollCausesScale', (GestureTester tester) {
final ScaleGestureRecognizer scale = ScaleGestureRecognizer(
dragStartBehavior: DragStartBehavior.start,
