refactor: renaming to

lib/app/view/app.dart

@@ -15,7 +15,7 @@ class App extends StatelessWidget {
     Key? key,
     required AuthenticationRepository authenticationRepository,
     required LeaderboardRepository leaderboardRepository,
-    required PinballPlayer pinballPlayer,
+    required PinballAudioPlayer pinballPlayer,
   })  : _authenticationRepository = authenticationRepository,
         _leaderboardRepository = leaderboardRepository,
         _pinballPlayer = pinballPlayer,
@@ -23,7 +23,7 @@ class App extends StatelessWidget {
 
   final AuthenticationRepository _authenticationRepository;
   final LeaderboardRepository _leaderboardRepository;
-  final PinballPlayer _pinballPlayer;
+  final PinballAudioPlayer _pinballPlayer;
 
   @override
   Widget build(BuildContext context) {

lib/game/behaviors/bonus_noise_behavior.dart

@@ -15,7 +15,7 @@ class BonusNoiseBehavior extends Component {
         },
         onNewState: (state) {
           final bonus = state.bonusHistory.last;
-          final audioPlayer = readProvider<PinballPlayer>();
+          final audioPlayer = readProvider<PinballAudioPlayer>();
 
           switch (bonus) {
             case GameBonus.googleWord:

lib/game/behaviors/bumper_noise_behavior.dart

@@ -6,6 +6,6 @@ class BumperNoiseBehavior extends ContactBehavior {
   @override
   void beginContact(Object other, Contact contact) {
     super.beginContact(other, contact);
-    readProvider<PinballPlayer>().play(PinballAudio.bumper);
+    readProvider<PinballAudioPlayer>().play(PinballAudio.bumper);
   }
 }

lib/game/components/controlled_plunger.dart

@@ -30,7 +30,7 @@ class PlungerNoiseBehavior extends Component {
   @override
   Future<void> onLoad() async {
     await super.onLoad();
-    readProvider<PinballPlayer>().play(PinballAudio.launcher);
+    readProvider<PinballAudioPlayer>().play(PinballAudio.launcher);
   }
 
   @override

lib/game/components/game_bloc_status_listener.dart

@@ -20,7 +20,7 @@ class GameBlocStatusListener extends Component
       case GameStatus.waiting:
         break;
       case GameStatus.playing:
-        readProvider<PinballPlayer>().play(PinballAudio.backgroundMusic);
+        readProvider<PinballAudioPlayer>().play(PinballAudio.backgroundMusic);
         gameRef
             .descendants()
             .whereType<Flipper>()
@@ -29,7 +29,7 @@ class GameBlocStatusListener extends Component
         gameRef.overlays.remove(PinballGame.playButtonOverlay);
         break;
       case GameStatus.gameOver:
-        readProvider<PinballPlayer>().play(PinballAudio.gameOverVoiceOver);
+        readProvider<PinballAudioPlayer>().play(PinballAudio.gameOverVoiceOver);
         gameRef.descendants().whereType<Backbox>().first.requestInitials(
               score: state.displayScore,
               character: readBloc<CharacterThemeCubit, CharacterThemeState>()

lib/game/pinball_game.dart

@@ -22,10 +22,10 @@ class PinballGame extends PinballForge2DGame
     required this.leaderboardRepository,
     required GameBloc gameBloc,
     required AppLocalizations l10n,
-    required PinballPlayer player,
+    required PinballAudioPlayer audioPlayer,
   })  : focusNode = FocusNode(),
         _gameBloc = gameBloc,
-        _player = player,
+        _audioPlayer = audioPlayer,
         _characterThemeBloc = characterThemeBloc,
         _l10n = l10n,
         super(
@@ -47,7 +47,7 @@ class PinballGame extends PinballForge2DGame
 
   final CharacterThemeCubit _characterThemeBloc;
 
-  final PinballPlayer _player;
+  final PinballAudioPlayer _audioPlayer;
 
   final LeaderboardRepository leaderboardRepository;
 
@@ -82,7 +82,7 @@ class PinballGame extends PinballForge2DGame
         children: [
           MultiFlameProvider(
             providers: [
-              FlameProvider<PinballPlayer>.value(_player),
+              FlameProvider<PinballAudioPlayer>.value(_audioPlayer),
               FlameProvider<LeaderboardRepository>.value(leaderboardRepository),
               FlameProvider<AppLocalizations>.value(_l10n),
             ],
@@ -188,11 +188,11 @@ class DebugPinballGame extends PinballGame with FPSCounter, PanDetector {
     required CharacterThemeCubit characterThemeBloc,
     required LeaderboardRepository leaderboardRepository,
     required AppLocalizations l10n,
-    required PinballPlayer player,
+    required PinballAudioPlayer audioPlayer,
     required GameBloc gameBloc,
   }) : super(
           characterThemeBloc: characterThemeBloc,
-          player: player,
+          audioPlayer: audioPlayer,
           leaderboardRepository: leaderboardRepository,
           l10n: l10n,
           gameBloc: gameBloc,

lib/game/view/pinball_game_page.dart

@@ -30,20 +30,20 @@ class PinballGamePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final characterThemeBloc = context.read<CharacterThemeCubit>();
-    final player = context.read<PinballPlayer>();
+    final audioPlayer = context.read<PinballAudioPlayer>();
     final leaderboardRepository = context.read<LeaderboardRepository>();
     final gameBloc = context.read<GameBloc>();
     final game = isDebugMode
         ? DebugPinballGame(
             characterThemeBloc: characterThemeBloc,
-            player: player,
+            audioPlayer: audioPlayer,
             leaderboardRepository: leaderboardRepository,
             l10n: context.l10n,
             gameBloc: gameBloc,
           )
         : PinballGame(
             characterThemeBloc: characterThemeBloc,
-            player: player,
+            audioPlayer: audioPlayer,
             leaderboardRepository: leaderboardRepository,
             l10n: context.l10n,
             gameBloc: gameBloc,
@@ -52,7 +52,7 @@ class PinballGamePage extends StatelessWidget {
     final loadables = [
       game.preFetchLeaderboard(),
       ...game.preLoadAssets(),
-      ...player.load(),
+      ...audioPlayer.load(),
       ...BonusAnimation.loadAssets(),
       ...SelectedCharacter.loadAssets(),
     ];

lib/how_to_play/widgets/how_to_play_dialog.dart

@@ -91,7 +91,9 @@ class _HowToPlayDialogState extends State<HowToPlayDialog> {
     return WillPopScope(
       onWillPop: () {
         widget.onDismissCallback.call();
-        context.read<PinballPlayer>().play(PinballAudio.ioPinballVoiceOver);
+        context
+            .read<PinballAudioPlayer>()
+            .play(PinballAudio.ioPinballVoiceOver);
         return Future.value(true);
       },
       child: PinballDialog(

lib/main_development.dart

@@ -11,7 +11,7 @@ void main() {
   bootstrap((firestore, firebaseAuth) async {
     final leaderboardRepository = LeaderboardRepository(firestore);
     final authenticationRepository = AuthenticationRepository(firebaseAuth);
-    final pinballPlayer = PinballPlayer();
+    final pinballPlayer = PinballAudioPlayer();
     unawaited(
       Firebase.initializeApp().then(
         (_) => authenticationRepository.authenticateAnonymously(),

lib/main_production.dart

@@ -11,7 +11,7 @@ void main() {
   bootstrap((firestore, firebaseAuth) async {
     final leaderboardRepository = LeaderboardRepository(firestore);
     final authenticationRepository = AuthenticationRepository(firebaseAuth);
-    final pinballPlayer = PinballPlayer();
+    final pinballPlayer = PinballAudioPlayer();
     unawaited(
       Firebase.initializeApp().then(
         (_) => authenticationRepository.authenticateAnonymously(),

lib/main_staging.dart

@@ -11,7 +11,7 @@ void main() {
   bootstrap((firestore, firebaseAuth) async {
     final leaderboardRepository = LeaderboardRepository(firestore);
     final authenticationRepository = AuthenticationRepository(firebaseAuth);
-    final pinballPlayer = PinballPlayer();
+    final pinballPlayer = PinballAudioPlayer();
     unawaited(
       Firebase.initializeApp().then(
         (_) => authenticationRepository.authenticateAnonymously(),

packages/pinball_audio/lib/src/pinball_audio.dart

@@ -145,12 +145,12 @@ class _BumperAudio extends _Audio {
   }
 }
 
-/// {@template pinball_player}
+/// {@template pinball_audio_player}
 /// Sound manager for the pinball game
 /// {@endtemplate}
-class PinballPlayer {
+class PinballAudioPlayer {
-  /// {@macro pinball_player}
+  /// {@macro pinball_audio_player}
-  PinballPlayer({
+  PinballAudioPlayer({
     CreateAudioPool? createAudioPool,
     PlaySingleAudio? playSingleAudio,
     LoopSingleAudio? loopSingleAudio,

packages/pinball_audio/test/src/pinball_audio_test.dart

@@ -51,7 +51,7 @@ void main() {
     late _MockLoopSingleAudio loopSingleAudio;
     late _PreCacheSingleAudio preCacheSingleAudio;
     late Random seed;
-    late PinballPlayer player;
+    late PinballAudioPlayer player;
 
     setUpAll(() {
       registerFallbackValue(_MockAudioCache());
@@ -81,7 +81,7 @@ void main() {
 
       seed = _MockRandom();
 
-      player = PinballPlayer(
+      player = PinballAudioPlayer(
         configureAudioCache: configureAudioCache.onCall,
         createAudioPool: createAudioPool.onCall,
         playSingleAudio: playSingleAudio.onCall,
@@ -92,7 +92,7 @@ void main() {
     });
 
     test('can be instantiated', () {
-      expect(PinballPlayer(), isNotNull);
+      expect(PinballAudioPlayer(), isNotNull);
     });
 
     group('load', () {
@@ -124,7 +124,7 @@ void main() {
       });
 
       test('sets the correct prefix', () async {
-        player = PinballPlayer(
+        player = PinballAudioPlayer(
           createAudioPool: createAudioPool.onCall,
           playSingleAudio: playSingleAudio.onCall,
           preCacheSingleAudio: preCacheSingleAudio.onCall,

test/app/view/app_test.dart

@@ -9,7 +9,7 @@ import 'package:pinball_audio/pinball_audio.dart';
 class _MockAuthenticationRepository extends Mock
     implements AuthenticationRepository {}
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
 }
@@ -18,12 +18,12 @@ void main() {
   group('App', () {
     late AuthenticationRepository authenticationRepository;
     late LeaderboardRepository leaderboardRepository;
-    late PinballPlayer pinballPlayer;
+    late PinballAudioPlayer pinballPlayer;
 
     setUp(() {
       authenticationRepository = _MockAuthenticationRepository();
       leaderboardRepository = _MockLeaderboardRepository();
-      pinballPlayer = _MockPinballPlayer();
+      pinballPlayer = _MockPinballAudioPlayer();
       when(pinballPlayer.load).thenAnswer((_) => [Future.value()]);
     });
 

test/game/behaviors/bonus_noise_behavior_test.dart

@@ -14,14 +14,14 @@ import 'package:pinball_flame/pinball_flame.dart';
 class _TestGame extends Forge2DGame {
   Future<void> pump(
     BonusNoiseBehavior child, {
-    required PinballPlayer player,
+    required PinballAudioPlayer player,
     required GameBloc bloc,
   }) {
     return ensureAdd(
       FlameBlocProvider<GameBloc, GameState>.value(
         value: bloc,
         children: [
-          FlameProvider<PinballPlayer>.value(
+          FlameProvider<PinballAudioPlayer>.value(
             player,
             children: [
               child,
@@ -33,7 +33,7 @@ class _TestGame extends Forge2DGame {
   }
 }
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 class _MockGameBloc extends Mock implements GameBloc {}
 
@@ -41,7 +41,7 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   group('BonusNoiseBehavior', () {
-    late PinballPlayer player;
+    late PinballAudioPlayer player;
     late GameBloc bloc;
     final flameTester = FlameTester(_TestGame.new);
 
@@ -50,7 +50,7 @@ void main() {
     });
 
     setUp(() {
-      player = _MockPinballPlayer();
+      player = _MockPinballAudioPlayer();
       when(() => player.play(any())).thenAnswer((_) {});
       bloc = _MockGameBloc();
     });

test/game/behaviors/bumper_noise_behavior_test.dart

@@ -9,9 +9,10 @@ import 'package:pinball_audio/pinball_audio.dart';
 import 'package:pinball_flame/pinball_flame.dart';
 
 class _TestGame extends Forge2DGame {
-  Future<void> pump(_TestBodyComponent child, {required PinballPlayer player}) {
+  Future<void> pump(_TestBodyComponent child,
+      {required PinballAudioPlayer player}) {
     return ensureAdd(
-      FlameProvider<PinballPlayer>.value(
+      FlameProvider<PinballAudioPlayer>.value(
         player,
         children: [
           child,
@@ -26,7 +27,7 @@ class _TestBodyComponent extends BodyComponent {
   Body createBody() => world.createBody(BodyDef());
 }
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 class _MockContact extends Mock implements Contact {}
 
@@ -35,11 +36,11 @@ void main() {
 
   group('BumperNoiseBehavior', () {});
 
-  late PinballPlayer player;
+  late PinballAudioPlayer player;
   final flameTester = FlameTester(_TestGame.new);
 
   setUp(() {
-    player = _MockPinballPlayer();
+    player = _MockPinballAudioPlayer();
   });
 
   flameTester.testGameWidget(

test/game/components/controlled_plunger_test.dart

@@ -28,15 +28,15 @@ class _TestGame extends Forge2DGame with HasKeyboardHandlerComponents {
   Future<void> pump(
     Plunger child, {
     GameBloc? gameBloc,
-    PinballPlayer? pinballPlayer,
+    PinballAudioPlayer? pinballPlayer,
   }) {
     return ensureAdd(
       FlameBlocProvider<GameBloc, GameState>.value(
         value: gameBloc ?? GameBloc()
           ..add(const GameStarted()),
         children: [
-          FlameProvider<PinballPlayer>.value(
+          FlameProvider<PinballAudioPlayer>.value(
-            pinballPlayer ?? _MockPinballPlayer(),
+            pinballPlayer ?? _MockPinballAudioPlayer(),
             children: [child],
           )
         ],
@@ -47,7 +47,7 @@ class _TestGame extends Forge2DGame with HasKeyboardHandlerComponents {
 
 class _MockGameBloc extends Mock implements GameBloc {}
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -158,10 +158,10 @@ void main() {
   });
 
   group('PlungerNoiseBehavior', () {
-    late PinballPlayer player;
+    late PinballAudioPlayer player;
 
     setUp(() {
-      player = _MockPinballPlayer();
+      player = _MockPinballAudioPlayer();
     });
 
     flameTester.test('plays the correct sound on load', (game) async {

test/game/components/flutter_forest/flutter_forest_test.dart

@@ -36,7 +36,7 @@ class _TestGame extends Forge2DGame {
         value: _MockGameBloc(),
         children: [
           FlameProvider.value(
-            _MockPinballPlayer(),
+            _MockPinballAudioPlayer(),
             children: [
               ZCanvasComponent(children: [child]),
             ],
@@ -47,7 +47,7 @@ class _TestGame extends Forge2DGame {
   }
 }
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 class _MockGameBloc extends Mock implements GameBloc {}
 

test/game/components/game_bloc_status_listener_test.dart

@@ -30,7 +30,7 @@ class _TestGame extends Forge2DGame {
 
   Future<void> pump(
     Iterable<Component> children, {
-    PinballPlayer? pinballPlayer,
+    PinballAudioPlayer? pinballPlayer,
   }) async {
     return ensureAdd(
       FlameMultiBlocProvider(
@@ -45,8 +45,8 @@ class _TestGame extends Forge2DGame {
         children: [
           MultiFlameProvider(
             providers: [
-              FlameProvider<PinballPlayer>.value(
+              FlameProvider<PinballAudioPlayer>.value(
-                pinballPlayer ?? _MockPinballPlayer(),
+                pinballPlayer ?? _MockPinballAudioPlayer(),
               ),
               FlameProvider<AppLocalizations>.value(
                 _MockAppLocalizations(),
@@ -60,7 +60,7 @@ class _TestGame extends Forge2DGame {
   }
 }
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
 }
@@ -191,7 +191,7 @@ void main() {
         flameTester.test(
           'plays the game over voice over',
           (game) async {
-            final player = _MockPinballPlayer();
+            final player = _MockPinballAudioPlayer();
             final component = GameBlocStatusListener();
             final repository = _MockLeaderboardRepository();
             final backbox = Backbox(
@@ -219,7 +219,7 @@ void main() {
         flameTester.test(
           'plays the background music on start',
           (game) async {
-            final player = _MockPinballPlayer();
+            final player = _MockPinballAudioPlayer();
             final component = GameBlocStatusListener();
             await game.pump([component], pinballPlayer: player);
 

test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart

@@ -36,8 +36,8 @@ class _TestGame extends Forge2DGame {
       FlameBlocProvider<GameBloc, GameState>.value(
         value: gameBloc,
         children: [
-          FlameProvider<PinballPlayer>.value(
+          FlameProvider<PinballAudioPlayer>.value(
-            _MockPinballPlayer(),
+            _MockPinballAudioPlayer(),
             children: [child],
           )
         ],
@@ -48,7 +48,7 @@ class _TestGame extends Forge2DGame {
 
 class _MockGameBloc extends Mock implements GameBloc {}
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

test/game/pinball_game_test.dart

@@ -24,7 +24,7 @@ class _TestPinballGame extends PinballGame {
           leaderboardRepository: _MockLeaderboardRepository(),
           gameBloc: GameBloc(),
           l10n: _MockAppLocalizations(),
-          player: _MockPinballPlayer(),
+          audioPlayer: _MockPinballAudioPlayer(),
         );
 
   @override
@@ -43,7 +43,7 @@ class _TestDebugPinballGame extends DebugPinballGame {
           leaderboardRepository: _MockLeaderboardRepository(),
           gameBloc: GameBloc(),
           l10n: _MockAppLocalizations(),
-          player: _MockPinballPlayer(),
+          audioPlayer: _MockPinballAudioPlayer(),
         );
 
   @override
@@ -78,7 +78,7 @@ class _MockDragEndInfo extends Mock implements DragEndInfo {}
 class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
 }
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

test/game/view/pinball_game_page_test.dart

@@ -26,7 +26,7 @@ class _TestPinballGame extends PinballGame {
           leaderboardRepository: _MockLeaderboardRepository(),
           gameBloc: GameBloc(),
           l10n: _MockAppLocalizations(),
-          player: _MockPinballPlayer(),
+          audioPlayer: _MockPinballAudioPlayer(),
         );
 
   @override
@@ -52,7 +52,7 @@ class _MockStartGameBloc extends Mock implements StartGameBloc {}
 
 class _MockAppLocalizations extends Mock implements AppLocalizations {}
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
 }

test/helpers/pump_app.dart

@@ -24,12 +24,12 @@ class _MockGameBloc extends Mock implements GameBloc {}
 
 class _MockStartGameBloc extends Mock implements StartGameBloc {}
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
-PinballPlayer _buildDefaultPinballPlayer() {
+PinballAudioPlayer _buildDefaultPinballAudioPlayer() {
-  final player = _MockPinballPlayer();
+  final audioPlayer = _MockPinballAudioPlayer();
-  when(player.load).thenAnswer((_) => [Future.value()]);
+  when(audioPlayer.load).thenAnswer((_) => [Future.value()]);
-  return player;
+  return audioPlayer;
 }
 
 AssetsManagerCubit _buildDefaultAssetsManagerCubit() {
@@ -55,7 +55,7 @@ extension PumpApp on WidgetTester {
     AssetsManagerCubit? assetsManagerCubit,
     CharacterThemeCubit? characterThemeCubit,
     LeaderboardRepository? leaderboardRepository,
-    PinballPlayer? pinballPlayer,
+    PinballAudioPlayer? pinballPlayer,
   }) {
     return runAsync(() {
       return pumpWidget(
@@ -65,7 +65,7 @@ extension PumpApp on WidgetTester {
               value: leaderboardRepository ?? _MockLeaderboardRepository(),
             ),
             RepositoryProvider.value(
-              value: pinballPlayer ?? _buildDefaultPinballPlayer(),
+              value: pinballPlayer ?? _buildDefaultPinballAudioPlayer(),
             ),
           ],
           child: MultiBlocProvider(

test/start_game/widgets/start_game_listener_test.dart

@@ -16,11 +16,11 @@ class _MockGameBloc extends Mock implements GameBloc {}
 
 class _MockCharacterThemeCubit extends Mock implements CharacterThemeCubit {}
 
-class _MockPinballPlayer extends Mock implements PinballPlayer {}
+class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
 
 void main() {
   late StartGameBloc startGameBloc;
-  late PinballPlayer pinballPlayer;
+  late PinballAudioPlayer pinballAudioPlayer;
   late CharacterThemeCubit characterThemeCubit;
 
   group('StartGameListener', () {
@@ -28,7 +28,7 @@ void main() {
       await mockFlameImages();
 
       startGameBloc = _MockStartGameBloc();
-      pinballPlayer = _MockPinballPlayer();
+      pinballAudioPlayer = _MockPinballAudioPlayer();
       characterThemeCubit = _MockCharacterThemeCubit();
     });
 
@@ -241,7 +241,7 @@ void main() {
               child: SizedBox.shrink(),
             ),
             startGameBloc: startGameBloc,
-            pinballPlayer: pinballPlayer,
+            pinballPlayer: pinballAudioPlayer,
           );
           await tester.pumpAndSettle();
 
@@ -258,7 +258,7 @@ void main() {
           );
           await tester.pumpAndSettle();
 
-          verify(() => pinballPlayer.play(PinballAudio.ioPinballVoiceOver))
+          verify(() => pinballAudioPlayer.play(PinballAudio.ioPinballVoiceOver))
               .called(1);
         },
       );