fix: plunger on mobile (#259)

* fix: plunger on mobile

* fix: plunger on mobile

* fix: plunger on mobile

lib/game/pinball_game.dart

@@ -88,7 +88,7 @@ class PinballGame extends Forge2DGame
 
       // NOTE(wolfen): As long as Flame does not have https://github.com/flame-engine/flame/issues/1586 we need to check it at the highest level manually.
       if (bounds.contains(info.eventPosition.game.toOffset())) {
-        descendants().whereType<Plunger>().single.pull();
+        descendants().whereType<Plunger>().single.pullFor(2);
       } else {
         final leftSide = info.eventPosition.widget.x < canvasSize.x / 2;
         focusedBoardSide = leftSide ? BoardSide.left : BoardSide.right;
@@ -104,21 +104,12 @@ class PinballGame extends Forge2DGame
 
   @override
   void onTapUp(TapUpInfo info) {
-    final rocket = descendants().whereType<RocketSpriteComponent>().first;
-    final bounds = rocket.topLeftPosition & rocket.size;
-
-    if (bounds.contains(info.eventPosition.game.toOffset())) {
-      descendants().whereType<Plunger>().single.release();
-    } else {
     _moveFlippersDown();
-    }
     super.onTapUp(info);
   }
 
   @override
   void onTapCancel() {
-    descendants().whereType<Plunger>().single.release();
-
     _moveFlippersDown();
     super.onTapCancel();
   }

packages/pinball_components/lib/src/components/plunger.dart

@@ -68,6 +68,14 @@ class Plunger extends BodyComponent with InitialPosition, Layered, ZIndex {
     return body;
   }
 
+  var _pullingDownTime = 0.0;
+
+  /// Pulls the plunger down for the given amount of [seconds].
+  // ignore: use_setters_to_change_properties
+  void pullFor(double seconds) {
+    _pullingDownTime = seconds;
+  }
+
   /// Set a constant downward velocity on the [Plunger].
   void pull() {
     body.linearVelocity = Vector2(0, 7);
@@ -79,11 +87,26 @@ class Plunger extends BodyComponent with InitialPosition, Layered, ZIndex {
   /// The velocity's magnitude depends on how far the [Plunger] has been pulled
   /// from its original [initialPosition].
   void release() {
+    _pullingDownTime = 0;
     final velocity = (initialPosition.y - body.position.y) * 11;
     body.linearVelocity = Vector2(0, velocity);
     _spriteComponent.release();
   }
 
+  @override
+  void update(double dt) {
+    // Ensure that we only pull or release when the time is greater than zero.
+    if (_pullingDownTime > 0) {
+      _pullingDownTime -= dt;
+      if (_pullingDownTime <= 0) {
+        release();
+      } else {
+        pull();
+      }
+    }
+    super.update(dt);
+  }
+
   /// Anchors the [Plunger] to the [PrismaticJoint] that controls its vertical
   /// motion.
   Future<void> _anchorToJoint() async {

packages/pinball_components/test/src/components/plunger_test.dart

@@ -121,6 +121,33 @@ void main() {
       );
     });
 
+    group('pullFor', () {
+      late Plunger plunger;
+
+      setUp(() {
+        plunger = Plunger(
+          compressionDistance: compressionDistance,
+        );
+      });
+
+      flameTester.testGameWidget(
+        'moves downwards for given period when pullFor is called',
+        setUp: (game, tester) async {
+          await game.ensureAdd(plunger);
+        },
+        verify: (game, tester) async {
+          plunger.pullFor(2);
+          game.update(0);
+
+          expect(plunger.body.linearVelocity.y, isPositive);
+
+          await tester.pump(const Duration(seconds: 2));
+
+          expect(plunger.body.linearVelocity.y, isZero);
+        },
+      );
+    });
+
     group('pull', () {
       late Plunger plunger;
 

test/game/pinball_game_test.dart

@@ -414,54 +414,9 @@ void main() {
 
         game.onTapDown(tapDownEvent);
 
-        expect(plunger.body.linearVelocity.y, equals(7));
+        game.update(1);
-      });
-
-      flameTester.test('tap up releases plunger', (game) async {
-        final eventPosition = MockEventPosition();
-        when(() => eventPosition.game).thenReturn(Vector2(40, 60));
-
-        final raw = MockTapDownDetails();
-        when(() => raw.kind).thenReturn(PointerDeviceKind.touch);
-
-        final tapDownEvent = MockTapDownInfo();
-        when(() => tapDownEvent.eventPosition).thenReturn(eventPosition);
-        when(() => tapDownEvent.raw).thenReturn(raw);
-
-        final plunger = game.descendants().whereType<Plunger>().first;
-        game.onTapDown(tapDownEvent);
-
-        expect(plunger.body.linearVelocity.y, equals(7));
-
-        final tapUpEvent = MockTapUpInfo();
-        when(() => tapUpEvent.eventPosition).thenReturn(eventPosition);
-
-        game.onTapUp(tapUpEvent);
-
-        expect(plunger.body.linearVelocity.y, equals(0));
-      });
-
-      flameTester.test('tap cancel releases plunger', (game) async {
-        await game.ready();
-
-        final eventPosition = MockEventPosition();
-        when(() => eventPosition.game).thenReturn(Vector2(40, 60));
-
-        final raw = MockTapDownDetails();
-        when(() => raw.kind).thenReturn(PointerDeviceKind.touch);
-
-        final tapDownEvent = MockTapDownInfo();
-        when(() => tapDownEvent.eventPosition).thenReturn(eventPosition);
-        when(() => tapDownEvent.raw).thenReturn(raw);
-
-        final plunger = game.descendants().whereType<Plunger>().first;
-        game.onTapDown(tapDownEvent);
-
-        expect(plunger.body.linearVelocity.y, equals(7));
-
-        game.onTapCancel();
 
-        expect(plunger.body.linearVelocity.y, equals(0));
+        expect(plunger.body.linearVelocity.y, isPositive);
       });
     });
   });