refactor: PR suggestions

lib/game/components/android_acres/behaviors/android_spaceship_bonus_behavior.dart

@@ -3,7 +3,7 @@ import 'package:pinball/game/game.dart';
 import 'package:pinball_components/pinball_components.dart';
 import 'package:pinball_flame/pinball_flame.dart';
 
-/// Adds a [GameBonus.androidSpaceship] when [AndroidSpaceship] is activated.
+/// Adds a [GameBonus.androidSpaceship] when [AndroidSpaceship] has a bonus.
 class AndroidSpaceshipBonusBehavior extends Component
     with HasGameRef<PinballGame>, ParentIsA<AndroidAcres> {
   @override
@@ -14,13 +14,14 @@ class AndroidSpaceshipBonusBehavior extends Component
     // TODO(alestiago): Refactor subscription management once the following is
     // merged:
     // https://github.com/flame-engine/flame/pull/1538
-    androidSpaceship.bloc.stream.listen((_) {
-      if (androidSpaceship.bloc.state == AndroidSpaceshipState.activated) {
-        gameRef
-            .read<GameBloc>()
-            .add(const BonusActivated(GameBonus.androidSpaceship));
-        androidSpaceship.bloc.onBonusAwarded();
-      }
+    androidSpaceship.bloc.stream.listen((state) {
+      final listenWhen = state == AndroidSpaceshipState.withBonus;
+      if (!listenWhen) return;
+
+      gameRef
+          .read<GameBloc>()
+          .add(const BonusActivated(GameBonus.androidSpaceship));
+      androidSpaceship.bloc.onBonusAwarded();
     });
   }
 }

packages/pinball_components/lib/src/components/android_spaceship/behaviors/android_spaceship_entrance_ball_contact_behavior.dart.dart

@@ -11,6 +11,6 @@ class AndroidSpaceshipEntranceBallContactBehavior
     super.beginContact(other, contact);
     if (other is! Ball) return;
 
-    parent.parent.bloc.onEntered();
+    parent.parent.bloc.onBallEntered();
   }
 }

packages/pinball_components/lib/src/components/android_spaceship/cubit/android_spaceship_cubit.dart

@@ -5,9 +5,9 @@ import 'package:bloc/bloc.dart';
 part 'android_spaceship_state.dart';
 
 class AndroidSpaceshipCubit extends Cubit<AndroidSpaceshipState> {
-  AndroidSpaceshipCubit() : super(AndroidSpaceshipState.idle);
+  AndroidSpaceshipCubit() : super(AndroidSpaceshipState.withoutBonus);
 
-  void onEntered() => emit(AndroidSpaceshipState.activated);
+  void onBallEntered() => emit(AndroidSpaceshipState.withBonus);
 
-  void onBonusAwarded() => emit(AndroidSpaceshipState.idle);
+  void onBonusAwarded() => emit(AndroidSpaceshipState.withoutBonus);
 }

packages/pinball_components/lib/src/components/android_spaceship/cubit/android_spaceship_state.dart

@@ -3,6 +3,6 @@
 part of 'android_spaceship_cubit.dart';
 
 enum AndroidSpaceshipState {
-  idle,
-  activated,
+  withoutBonus,
+  withBonus,
 }

packages/pinball_components/test/src/components/android_spaceship/android_spaceship_test.dart

@@ -41,6 +41,7 @@ void main() {
         await tester.pump();
       },
       verify: (game, tester) async {
+        const goldenFilePath = '../golden/android_spaceship/';
         final animationDuration = game
             .descendants()
             .whereType<SpriteAnimationComponent>()
@@ -50,21 +51,21 @@ void main() {
 
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('../golden/android_spaceship/start.png'),
+          matchesGoldenFile('${goldenFilePath}start.png'),
         );
 
         game.update(animationDuration * 0.5);
         await tester.pump();
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('../golden/android_spaceship/middle.png'),
+          matchesGoldenFile('${goldenFilePath}middle.png'),
         );
 
         game.update(animationDuration * 0.5);
         await tester.pump();
         await expectLater(
           find.byGame<TestGame>(),
-          matchesGoldenFile('../golden/android_spaceship/end.png'),
+          matchesGoldenFile('${goldenFilePath}end.png'),
         );
       },
     );
@@ -77,7 +78,7 @@ void main() {
       whenListen(
         bloc,
         const Stream<AndroidSpaceshipState>.empty(),
-        initialState: AndroidSpaceshipState.idle,
+        initialState: AndroidSpaceshipState.withoutBonus,
       );
       when(bloc.close).thenAnswer((_) async {});
       final androidSpaceship = AndroidSpaceship.test(bloc: bloc);

packages/pinball_components/test/src/components/android_spaceship/behaviors/android_spaceship_entrance_ball_contact_behavior_test.dart

@@ -27,14 +27,14 @@ void main() {
       });
 
       flameTester.test(
-        'beginContact emits onEntered when entrance contacts with a ball',
+        'beginContact calls onBallEntered when entrance contacts with a ball',
         (game) async {
           final behavior = AndroidSpaceshipEntranceBallContactBehavior();
           final bloc = _MockAndroidSpaceshipCubit();
           whenListen(
             bloc,
             const Stream<AndroidSpaceshipState>.empty(),
-            initialState: AndroidSpaceshipState.idle,
+            initialState: AndroidSpaceshipState.withoutBonus,
           );
 
           final entrance = AndroidSpaceshipEntrance();
@@ -47,7 +47,7 @@ void main() {
 
           behavior.beginContact(MockBall(), MockContact());
 
-          verify(androidSpaceship.bloc.onEntered).called(1);
+          verify(androidSpaceship.bloc.onBallEntered).called(1);
         },
       );
     },

packages/pinball_components/test/src/components/android_spaceship/cubit/android_spaceship_cubit_test.dart

@@ -7,17 +7,17 @@ void main() {
     'AndroidSpaceshipCubit',
     () {
       blocTest<AndroidSpaceshipCubit, AndroidSpaceshipState>(
-        'onEntered emits activated',
+        'onBallEntered emits withBonus',
         build: AndroidSpaceshipCubit.new,
-        act: (bloc) => bloc.onEntered(),
-        expect: () => [AndroidSpaceshipState.activated],
+        act: (bloc) => bloc.onBallEntered(),
+        expect: () => [AndroidSpaceshipState.withBonus],
       );
 
       blocTest<AndroidSpaceshipCubit, AndroidSpaceshipState>(
-        'onBonusAwarded emits idle',
+        'onBonusAwarded emits withoutBonus',
         build: AndroidSpaceshipCubit.new,
         act: (bloc) => bloc.onBonusAwarded(),
-        expect: () => [AndroidSpaceshipState.idle],
+        expect: () => [AndroidSpaceshipState.withoutBonus],
       );
     },
   );

test/game/components/android_acres/behaviors/android_spaceship_bonus_behavior_test.dart

@@ -57,7 +57,7 @@ void main() {
 
     flameBlocTester.testGameWidget(
       'adds GameBonus.androidSpaceship to the game '
-      'when android spacehship is activated',
+      'when android spacehship has a bonus',
       setUp: (game, tester) async {
         final behavior = AndroidSpaceshipBonusBehavior();
         final parent = AndroidAcres.test();
@@ -67,7 +67,7 @@ void main() {
         await game.ensureAdd(parent);
         await parent.ensureAdd(behavior);
 
-        androidSpaceship.bloc.onEntered();
+        androidSpaceship.bloc.onBallEntered();
         await tester.pump();
 
         verify(