Better structure

Author: luanpotter

packages/flame/lib/src/events/flame_game_mixins/dispatcher.dart

@@ -1,6 +1,5 @@
 import 'package:flame/components.dart';
 import 'package:flame/src/game/flame_game.dart';
-import 'package:flutter/foundation.dart';
 
 abstract class Dispatcher<G extends FlameGame> extends Component
     with HasGameReference<G> {
@@ -18,12 +17,7 @@ abstract class Dispatcher<G extends FlameGame> extends Component
     game.add(dispatcher);
   }
 
-  static void removeDispatcher(
-    FlameGame game,
-    ComponentKey key, {
-    VoidCallback? unregister,
-  }) {
-    unregister?.call();
+  static void removeDispatcher(FlameGame game, ComponentKey key) {
     game.unregisterKey(key);
   }
 }

packages/flame/lib/src/events/flame_game_mixins/double_tap_dispatcher.dart

@@ -69,12 +69,7 @@ class DoubleTapDispatcher extends Dispatcher<FlameGame> {
 
   @override
   void onRemove() {
-    Dispatcher.removeDispatcher(
-      game,
-      const DoubleTapDispatcherKey(),
-      unregister: () {
-        game.gestureDetectors.unregister<DoubleTapGestureRecognizer>();
-      },
-    );
+    game.gestureDetectors.unregister<DoubleTapGestureRecognizer>();
+    Dispatcher.removeDispatcher(game, const DoubleTapDispatcherKey());
   }
 }

packages/flame/lib/src/events/flame_game_mixins/long_press_dispatcher.dart

@@ -147,14 +147,8 @@ class LongPressDispatcher extends Dispatcher<FlameGame> {
 
   @override
   void onRemove() {
-    Dispatcher.removeDispatcher(
-      game,
-      const LongPressDispatcherKey(),
-      unregister: () {
-        game.gestureDetectors.unregister<LongPressGestureRecognizer>();
-      },
-    );
-    super.onRemove();
+    game.gestureDetectors.unregister<LongPressGestureRecognizer>();
+    Dispatcher.removeDispatcher(game, const LongPressDispatcherKey());
   }
 }
 

packages/flame/lib/src/events/flame_game_mixins/multi_drag_dispatcher.dart

@@ -206,13 +206,8 @@ class MultiDragDispatcher extends Dispatcher<FlameGame>
 
   @override
   void onRemove() {
-    Dispatcher.removeDispatcher(
-      game,
-      const MultiDragDispatcherKey(),
-      unregister: () {
-        game.gestureDetectors.unregister<ImmediateMultiDragGestureRecognizer>();
-      },
-    );
+    game.gestureDetectors.unregister<ImmediateMultiDragGestureRecognizer>();
+    Dispatcher.removeDispatcher(game, const MultiDragDispatcherKey());
     _dragUpdateController.close();
     _dragCancelController.close();
     _dragStartController.close();

packages/flame/lib/src/events/flame_game_mixins/multi_tap_dispatcher.dart

@@ -178,13 +178,8 @@ class MultiTapDispatcher extends Dispatcher<FlameGame>
 
   @override
   void onRemove() {
-    Dispatcher.removeDispatcher(
-      game,
-      const MultiTapDispatcherKey(),
-      unregister: () {
-        game.gestureDetectors.unregister<MultiTapGestureRecognizer>();
-      },
-    );
+    game.gestureDetectors.unregister<MultiTapGestureRecognizer>();
+    Dispatcher.removeDispatcher(game, const MultiTapDispatcherKey());
   }
 
   @override

packages/flame/lib/src/events/flame_game_mixins/scale_dispatcher.dart

@@ -341,13 +341,8 @@ class ScaleDispatcher extends Dispatcher<FlameGame> implements ScaleListener {
 
   @override
   void onRemove() {
-    Dispatcher.removeDispatcher(
-      game,
-      const ScaleDispatcherKey(),
-      unregister: () {
-        game.gestureDetectors.unregister<ScaleGestureRecognizer>();
-      },
-    );
+    game.gestureDetectors.unregister<ScaleGestureRecognizer>();
+    Dispatcher.removeDispatcher(game, const ScaleDispatcherKey());
     super.onRemove();
   }
 

packages/flame/lib/src/events/flame_game_mixins/secondary_tap_dispatcher.dart

@@ -71,12 +71,7 @@ class SecondaryTapDispatcher extends Dispatcher<FlameGame> {
 
   @override
   void onRemove() {
-    Dispatcher.removeDispatcher(
-      game,
-      const SecondaryTapDispatcherKey(),
-      unregister: () {
-        game.gestureDetectors.unregister<TapGestureRecognizer>();
-      },
-    );
+    game.gestureDetectors.unregister<TapGestureRecognizer>();
+    Dispatcher.removeDispatcher(game, const SecondaryTapDispatcherKey());
   }
 }