diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart index 97ef8d63..f621f1e2 100644 --- a/lib/app/view/app.dart +++ b/lib/app/view/app.dart @@ -9,7 +9,6 @@ import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/start_game/start_game.dart'; import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_ui/pinball_ui.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; class App extends StatelessWidget { @@ -19,19 +18,16 @@ class App extends StatelessWidget { required LeaderboardRepository leaderboardRepository, required ShareRepository shareRepository, required PinballAudioPlayer pinballAudioPlayer, - required PlatformHelper platformHelper, }) : _authenticationRepository = authenticationRepository, _leaderboardRepository = leaderboardRepository, _shareRepository = shareRepository, _pinballAudioPlayer = pinballAudioPlayer, - _platformHelper = platformHelper, super(key: key); final AuthenticationRepository _authenticationRepository; final LeaderboardRepository _leaderboardRepository; final ShareRepository _shareRepository; final PinballAudioPlayer _pinballAudioPlayer; - final PlatformHelper _platformHelper; @override Widget build(BuildContext context) { @@ -41,7 +37,6 @@ class App extends StatelessWidget { RepositoryProvider.value(value: _leaderboardRepository), RepositoryProvider.value(value: _shareRepository), RepositoryProvider.value(value: _pinballAudioPlayer), - RepositoryProvider.value(value: _platformHelper), ], child: MultiBlocProvider( providers: [ diff --git a/lib/game/behaviors/character_selection_behavior.dart b/lib/game/behaviors/character_selection_behavior.dart index e62438f6..27003d75 100644 --- a/lib/game/behaviors/character_selection_behavior.dart +++ b/lib/game/behaviors/character_selection_behavior.dart @@ -2,8 +2,6 @@ import 'package:flame/components.dart'; import 'package:flame_bloc/flame_bloc.dart'; import 'package:pinball/select_character/select_character.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:pinball_flame/pinball_flame.dart'; -import 'package:platform_helper/platform_helper.dart'; /// Updates the [ArcadeBackground] and launch [Ball] to reflect character /// selections. @@ -13,14 +11,12 @@ class CharacterSelectionBehavior extends Component HasGameRef { @override void onNewState(CharacterThemeState state) { - if (!readProvider().isMobile) { - gameRef - .descendants() - .whereType() - .single - .bloc - .onCharacterSelected(state.characterTheme); - } + gameRef + .descendants() + .whereType() + .single + .bloc + .onCharacterSelected(state.characterTheme); gameRef .descendants() .whereType() diff --git a/lib/game/components/backbox/backbox.dart b/lib/game/components/backbox/backbox.dart index 4ce44348..3b3b2614 100644 --- a/lib/game/components/backbox/backbox.dart +++ b/lib/game/components/backbox/backbox.dart @@ -27,19 +27,23 @@ class Backbox extends PositionComponent with ZIndex, HasGameRef { leaderboardRepository: leaderboardRepository, initialEntries: entries, ), - _shareRepository = shareRepository; + _shareRepository = shareRepository, + _platformHelper = PlatformHelper(); /// {@macro backbox} @visibleForTesting Backbox.test({ required BackboxBloc bloc, required ShareRepository shareRepository, + required PlatformHelper platformHelper, }) : _bloc = bloc, - _shareRepository = shareRepository; + _shareRepository = shareRepository, + _platformHelper = platformHelper; final ShareRepository _shareRepository; late final Component _display; final BackboxBloc _bloc; + final PlatformHelper _platformHelper; late StreamSubscription _subscription; @override @@ -72,7 +76,7 @@ class Backbox extends PositionComponent with ZIndex, HasGameRef { } else if (state is LeaderboardFailureState) { _display.add(LeaderboardFailureDisplay()); } else if (state is InitialsFormState) { - if (readProvider().isMobile) { + if (_platformHelper.isMobile) { gameRef.overlays.add(PinballGame.mobileControlsOverlay); } _display.add( diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index fccd494e..a770985b 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -12,7 +12,7 @@ extension PinballGameAssetsX on PinballGame { const androidTheme = AndroidTheme(); const dinoTheme = DinoTheme(); - final gameAssets = [ + return [ images.load(components.Assets.images.boardBackground.keyName), images.load(components.Assets.images.ball.flameEffect.keyName), images.load(components.Assets.images.signpost.inactive.keyName), @@ -148,21 +148,17 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.displayArrows.arrowLeft.keyName), images.load(components.Assets.images.displayArrows.arrowRight.keyName), images.load(androidTheme.leaderboardIcon.keyName), + images.load(androidTheme.background.keyName), images.load(androidTheme.ball.keyName), images.load(dashTheme.leaderboardIcon.keyName), + images.load(dashTheme.background.keyName), images.load(dashTheme.ball.keyName), images.load(dinoTheme.leaderboardIcon.keyName), + images.load(dinoTheme.background.keyName), images.load(dinoTheme.ball.keyName), images.load(sparkyTheme.leaderboardIcon.keyName), + images.load(sparkyTheme.background.keyName), images.load(sparkyTheme.ball.keyName), ]; - - return (platformHelper.isMobile) ? gameAssets : gameAssets - ..addAll([ - images.load(androidTheme.background.keyName), - images.load(dashTheme.background.keyName), - images.load(dinoTheme.background.keyName), - images.load(sparkyTheme.background.keyName), - ]); } } diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index b1f3c98a..1d18d6c1 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -14,7 +14,6 @@ import 'package:pinball/select_character/select_character.dart'; import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; class PinballGame extends PinballForge2DGame @@ -26,7 +25,6 @@ class PinballGame extends PinballForge2DGame required GameBloc gameBloc, required AppLocalizations l10n, required PinballAudioPlayer audioPlayer, - required this.platformHelper, }) : focusNode = FocusNode(), _gameBloc = gameBloc, _audioPlayer = audioPlayer, @@ -59,8 +57,6 @@ class PinballGame extends PinballForge2DGame final AppLocalizations _l10n; - final PlatformHelper platformHelper; - final GameBloc _gameBloc; List? _entries; @@ -94,7 +90,6 @@ class PinballGame extends PinballForge2DGame FlameProvider.value(leaderboardRepository), FlameProvider.value(shareRepository), FlameProvider.value(_l10n), - FlameProvider.value(platformHelper), ], children: [ BonusNoiseBehavior(), @@ -111,7 +106,7 @@ class PinballGame extends PinballForge2DGame children: [ ZCanvasComponent( children: [ - if (!platformHelper.isMobile) ArcadeBackground(), + ArcadeBackground(), BoardBackgroundSpriteComponent(), Boundaries(), Backbox( @@ -203,7 +198,6 @@ class DebugPinballGame extends PinballGame with FPSCounter, PanDetector { required ShareRepository shareRepository, required AppLocalizations l10n, required PinballAudioPlayer audioPlayer, - required PlatformHelper platformHelper, required GameBloc gameBloc, }) : super( characterThemeBloc: characterThemeBloc, @@ -211,7 +205,6 @@ class DebugPinballGame extends PinballGame with FPSCounter, PanDetector { leaderboardRepository: leaderboardRepository, shareRepository: shareRepository, l10n: l10n, - platformHelper: platformHelper, gameBloc: gameBloc, ); diff --git a/lib/game/view/pinball_game_page.dart b/lib/game/view/pinball_game_page.dart index efc11996..a36754d8 100644 --- a/lib/game/view/pinball_game_page.dart +++ b/lib/game/view/pinball_game_page.dart @@ -11,7 +11,6 @@ import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/start_game/start_game.dart'; import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_ui/pinball_ui.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; class PinballGamePage extends StatelessWidget { @@ -28,7 +27,6 @@ class PinballGamePage extends StatelessWidget { final audioPlayer = context.read(); final leaderboardRepository = context.read(); final shareRepository = context.read(); - final platformHelper = context.read(); final gameBloc = context.read(); final game = isDebugMode ? DebugPinballGame( @@ -37,7 +35,6 @@ class PinballGamePage extends StatelessWidget { leaderboardRepository: leaderboardRepository, shareRepository: shareRepository, l10n: context.l10n, - platformHelper: platformHelper, gameBloc: gameBloc, ) : PinballGame( @@ -46,7 +43,6 @@ class PinballGamePage extends StatelessWidget { leaderboardRepository: leaderboardRepository, shareRepository: shareRepository, l10n: context.l10n, - platformHelper: platformHelper, gameBloc: gameBloc, ); diff --git a/lib/main.dart b/lib/main.dart index 877843ee..cb8c78da 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -6,7 +6,6 @@ import 'package:leaderboard_repository/leaderboard_repository.dart'; import 'package:pinball/app/app.dart'; import 'package:pinball/bootstrap.dart'; import 'package:pinball_audio/pinball_audio.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; void main() { @@ -16,7 +15,6 @@ void main() { ShareRepository(appUrl: ShareRepository.pinballGameUrl); final authenticationRepository = AuthenticationRepository(firebaseAuth); final pinballAudioPlayer = PinballAudioPlayer(); - final platformHelper = PlatformHelper(); unawaited( Firebase.initializeApp().then( (_) => authenticationRepository.authenticateAnonymously(), @@ -27,7 +25,6 @@ void main() { leaderboardRepository: leaderboardRepository, shareRepository: shareRepository, pinballAudioPlayer: pinballAudioPlayer, - platformHelper: platformHelper, ); }); } diff --git a/test/app/view/app_test.dart b/test/app/view/app_test.dart index b9f2ef16..d247a562 100644 --- a/test/app/view/app_test.dart +++ b/test/app/view/app_test.dart @@ -5,7 +5,6 @@ import 'package:mocktail/mocktail.dart'; import 'package:pinball/app/app.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_audio/pinball_audio.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; class _MockAuthenticationRepository extends Mock @@ -18,25 +17,18 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { class _MockShareRepository extends Mock implements ShareRepository {} -class _MockPlatformHelper extends Mock implements PlatformHelper { - @override - bool get isMobile => false; -} - void main() { group('App', () { late AuthenticationRepository authenticationRepository; late LeaderboardRepository leaderboardRepository; late ShareRepository shareRepository; late PinballAudioPlayer pinballAudioPlayer; - late PlatformHelper platformHelper; setUp(() { authenticationRepository = _MockAuthenticationRepository(); leaderboardRepository = _MockLeaderboardRepository(); shareRepository = _MockShareRepository(); pinballAudioPlayer = _MockPinballAudioPlayer(); - platformHelper = _MockPlatformHelper(); when(pinballAudioPlayer.load).thenAnswer((_) => [Future.value()]); }); @@ -47,7 +39,6 @@ void main() { leaderboardRepository: leaderboardRepository, shareRepository: shareRepository, pinballAudioPlayer: pinballAudioPlayer, - platformHelper: platformHelper, ), ); await tester.pump(const Duration(milliseconds: 1100)); diff --git a/test/game/behaviors/character_selection_behavior_test.dart b/test/game/behaviors/character_selection_behavior_test.dart index edf17999..67a8b0a5 100644 --- a/test/game/behaviors/character_selection_behavior_test.dart +++ b/test/game/behaviors/character_selection_behavior_test.dart @@ -12,7 +12,6 @@ import 'package:pinball/select_character/select_character.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_theme/pinball_theme.dart' as theme; -import 'package:platform_helper/platform_helper.dart'; class _TestGame extends Forge2DGame { @override @@ -29,17 +28,11 @@ class _TestGame extends Forge2DGame { Future pump( List children, { CharacterThemeCubit? characterThemeBloc, - PlatformHelper? platformHelper, }) async { await ensureAdd( FlameBlocProvider.value( value: characterThemeBloc ?? CharacterThemeCubit(), - children: [ - FlameProvider.value( - platformHelper ?? _MockPlatformHelper(), - children: children, - ), - ], + children: children, ), ); } @@ -50,8 +43,6 @@ class _MockBallCubit extends Mock implements BallCubit {} class _MockArcadeBackgroundCubit extends Mock implements ArcadeBackgroundCubit { } -class _MockPlatformHelper extends Mock implements PlatformHelper {} - void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -77,45 +68,8 @@ void main() { ); flameTester.test( - 'onNewState does not call onCharacterSelected on the arcade background ' - 'bloc when platform is mobile', - (game) async { - final platformHelper = _MockPlatformHelper(); - when(() => platformHelper.isMobile).thenAnswer((_) => true); - final arcadeBackgroundBloc = _MockArcadeBackgroundCubit(); - whenListen( - arcadeBackgroundBloc, - const Stream.empty(), - initialState: const ArcadeBackgroundState.initial(), - ); - final behavior = CharacterSelectionBehavior(); - await game.pump( - [ - behavior, - ZCanvasComponent(), - Plunger.test(compressionDistance: 10), - Ball.test(), - ], - platformHelper: platformHelper, - ); - - const dinoThemeState = CharacterThemeState(theme.DinoTheme()); - behavior.onNewState(dinoThemeState); - await game.ready(); - - verifyNever( - () => arcadeBackgroundBloc - .onCharacterSelected(dinoThemeState.characterTheme), - ); - }, - ); - - flameTester.test( - 'onNewState calls onCharacterSelected on the arcade background ' - 'bloc when platform is not mobile', + 'onNewState calls onCharacterSelected on the arcade background bloc', (game) async { - final platformHelper = _MockPlatformHelper(); - when(() => platformHelper.isMobile).thenAnswer((_) => false); final arcadeBackgroundBloc = _MockArcadeBackgroundCubit(); whenListen( arcadeBackgroundBloc, @@ -125,16 +79,13 @@ void main() { final arcadeBackground = ArcadeBackground.test(bloc: arcadeBackgroundBloc); final behavior = CharacterSelectionBehavior(); - await game.pump( - [ - arcadeBackground, - behavior, - ZCanvasComponent(), - Plunger.test(compressionDistance: 10), - Ball.test(), - ], - platformHelper: platformHelper, - ); + await game.pump([ + arcadeBackground, + behavior, + ZCanvasComponent(), + Plunger.test(compressionDistance: 10), + Ball.test(), + ]); const dinoThemeState = CharacterThemeState(theme.DinoTheme()); behavior.onNewState(dinoThemeState); @@ -150,8 +101,6 @@ void main() { flameTester.test( 'onNewState calls onCharacterSelected on the ball bloc', (game) async { - final platformHelper = _MockPlatformHelper(); - when(() => platformHelper.isMobile).thenAnswer((_) => false); final ballBloc = _MockBallCubit(); whenListen( ballBloc, @@ -160,16 +109,13 @@ void main() { ); final ball = Ball.test(bloc: ballBloc); final behavior = CharacterSelectionBehavior(); - await game.pump( - [ - ball, - behavior, - ZCanvasComponent(), - Plunger.test(compressionDistance: 10), - ArcadeBackground.test(), - ], - platformHelper: platformHelper, - ); + await game.pump([ + ball, + behavior, + ZCanvasComponent(), + Plunger.test(compressionDistance: 10), + ArcadeBackground.test(), + ]); const dinoThemeState = CharacterThemeState(theme.DinoTheme()); behavior.onNewState(dinoThemeState); diff --git a/test/game/components/backbox/backbox_test.dart b/test/game/components/backbox/backbox_test.dart index 26f413f7..0d9f2b6a 100644 --- a/test/game/components/backbox/backbox_test.dart +++ b/test/game/components/backbox/backbox_test.dart @@ -47,10 +47,7 @@ class _TestGame extends Forge2DGame ]); } - Future pump( - Backbox component, { - PlatformHelper? platformHelper, - }) async { + Future pump(Backbox component) async { // Not needed once https://github.com/flame-engine/flame/issues/1607 // is fixed await onLoad(); @@ -58,15 +55,8 @@ class _TestGame extends Forge2DGame FlameBlocProvider.value( value: GameBloc(), children: [ - MultiFlameProvider( - providers: [ - FlameProvider.value( - _MockAppLocalizations(), - ), - FlameProvider.value( - platformHelper ?? _MockPlatformHelper(), - ), - ], + FlameProvider.value( + _MockAppLocalizations(), children: [component], ), ], @@ -203,11 +193,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect(game.descendants(), contains(backbox)); }, ); @@ -223,8 +211,8 @@ void main() { Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), + platformHelper: platformHelper, ), - platformHelper: platformHelper, ); await tester.pump(); }, @@ -245,11 +233,9 @@ void main() { initialEntries: [LeaderboardEntryData.empty], ), shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); backbox.requestInitials( score: 0, character: game.character, @@ -279,11 +265,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); game.onKeyEvent(_mockKeyUp(LogicalKeyboardKey.enter), {}); verify( @@ -310,11 +294,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game.descendants().whereType().length, @@ -342,11 +324,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game.overlays.value, @@ -371,11 +351,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game.overlays.value, @@ -396,11 +374,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game.descendants().whereType().length, @@ -421,11 +397,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); final shareLink = game.descendants().whereType().first; @@ -453,11 +427,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game @@ -487,11 +459,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game.descendants().whereType().length, @@ -536,11 +506,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: shareRepository, - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); final facebookButton = game.descendants().whereType().first; @@ -592,11 +560,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: shareRepository, - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); final facebookButton = game.descendants().whereType().first; @@ -626,11 +592,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game.descendants().whereType().length, @@ -651,11 +615,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); expect( game.descendants().whereType().length, @@ -677,11 +639,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); backbox.removeFromParent(); await game.ready(); @@ -720,11 +680,9 @@ void main() { final backbox = Backbox.test( bloc: bloc, shareRepository: _MockShareRepository(), - ); - await game.pump( - backbox, platformHelper: platformHelper, ); + await game.pump(backbox); game.update(4); verify( diff --git a/test/game/components/game_bloc_status_listener_test.dart b/test/game/components/game_bloc_status_listener_test.dart index d468ce2f..c1ca9b3e 100644 --- a/test/game/components/game_bloc_status_listener_test.dart +++ b/test/game/components/game_bloc_status_listener_test.dart @@ -15,7 +15,6 @@ import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_theme/pinball_theme.dart' as theme; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; class _TestGame extends Forge2DGame with HasTappables { @@ -56,9 +55,6 @@ class _TestGame extends Forge2DGame with HasTappables { FlameProvider.value( _MockAppLocalizations(), ), - FlameProvider.value( - _MockPlatformHelper(), - ), ], children: children, ), @@ -75,11 +71,6 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { class _MockShareRepository extends Mock implements ShareRepository {} -class _MockPlatformHelper extends Mock implements PlatformHelper { - @override - bool get isMobile => false; -} - class _MockAppLocalizations extends Mock implements AppLocalizations { @override String get score => ''; diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 289fb4fa..52e8c97c 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -16,7 +16,6 @@ import 'package:pinball/game/game.dart'; import 'package:pinball/select_character/select_character.dart'; import 'package:pinball_audio/src/pinball_audio.dart'; import 'package:pinball_components/pinball_components.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; class _TestPinballGame extends PinballGame { @@ -28,7 +27,6 @@ class _TestPinballGame extends PinballGame { gameBloc: GameBloc(), l10n: _MockAppLocalizations(), audioPlayer: _MockPinballAudioPlayer(), - platformHelper: _MockPlatformHelper(), ); @override @@ -49,7 +47,6 @@ class _TestDebugPinballGame extends DebugPinballGame { gameBloc: GameBloc(), l10n: _MockAppLocalizations(), audioPlayer: _MockPinballAudioPlayer(), - platformHelper: _MockPlatformHelper(), ); @override @@ -91,11 +88,6 @@ class _MockShareRepository extends Mock implements ShareRepository {} class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} -class _MockPlatformHelper extends Mock implements PlatformHelper { - @override - bool get isMobile => false; -} - void main() { TestWidgetsFlutterBinding.ensureInitialized(); diff --git a/test/game/view/pinball_game_page_test.dart b/test/game/view/pinball_game_page_test.dart index a0a0f22c..fce6e74e 100644 --- a/test/game/view/pinball_game_page_test.dart +++ b/test/game/view/pinball_game_page_test.dart @@ -15,7 +15,6 @@ import 'package:pinball/more_information/more_information.dart'; import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/start_game/start_game.dart'; import 'package:pinball_audio/pinball_audio.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; import '../../helpers/helpers.dart'; @@ -29,7 +28,6 @@ class _TestPinballGame extends PinballGame { gameBloc: GameBloc(), l10n: _MockAppLocalizations(), audioPlayer: _MockPinballAudioPlayer(), - platformHelper: _MockPlatformHelper(), ); @override @@ -65,11 +63,6 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { class _MockShareRepository extends Mock implements ShareRepository {} -class _MockPlatformHelper extends Mock implements PlatformHelper { - @override - bool get isMobile => false; -} - void main() { final game = _TestPinballGame(); diff --git a/test/helpers/pump_app.dart b/test/helpers/pump_app.dart index d136487c..df75efae 100644 --- a/test/helpers/pump_app.dart +++ b/test/helpers/pump_app.dart @@ -12,7 +12,6 @@ import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/start_game/start_game.dart'; import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_ui/pinball_ui.dart'; -import 'package:platform_helper/platform_helper.dart'; import 'package:share_repository/share_repository.dart'; class _MockAssetsManagerCubit extends Mock implements AssetsManagerCubit {} @@ -30,8 +29,6 @@ class _MockStartGameBloc extends Mock implements StartGameBloc {} class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} -class _MockPlatformHelper extends Mock implements PlatformHelper {} - PinballAudioPlayer _buildDefaultPinballAudioPlayer() { final audioPlayer = _MockPinballAudioPlayer(); when(audioPlayer.load).thenAnswer((_) => [Future.value()]); @@ -63,7 +60,6 @@ extension PumpApp on WidgetTester { LeaderboardRepository? leaderboardRepository, ShareRepository? shareRepository, PinballAudioPlayer? pinballAudioPlayer, - PlatformHelper? platformHelper, }) { return runAsync(() { return pumpWidget( @@ -78,9 +74,6 @@ extension PumpApp on WidgetTester { RepositoryProvider.value( value: pinballAudioPlayer ?? _buildDefaultPinballAudioPlayer(), ), - RepositoryProvider.value( - value: platformHelper ?? _MockPlatformHelper(), - ), ], child: MultiBlocProvider( providers: [ diff --git a/test/start_game/widgets/start_game_listener_test.dart b/test/start_game/widgets/start_game_listener_test.dart index 61171a40..d801864b 100644 --- a/test/start_game/widgets/start_game_listener_test.dart +++ b/test/start_game/widgets/start_game_listener_test.dart @@ -7,7 +7,6 @@ import 'package:pinball/how_to_play/how_to_play.dart'; import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/start_game/start_game.dart'; import 'package:pinball_audio/pinball_audio.dart'; -import 'package:platform_helper/platform_helper.dart'; import '../../helpers/helpers.dart'; @@ -19,16 +18,10 @@ class _MockCharacterThemeCubit extends Mock implements CharacterThemeCubit {} class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} -class _MockPlatformHelper extends Mock implements PlatformHelper { - @override - bool get isMobile => false; -} - void main() { late StartGameBloc startGameBloc; late PinballAudioPlayer pinballAudioPlayer; late CharacterThemeCubit characterThemeCubit; - late PlatformHelper platformHelper; group('StartGameListener', () { setUp(() async { @@ -37,7 +30,6 @@ void main() { startGameBloc = _MockStartGameBloc(); pinballAudioPlayer = _MockPinballAudioPlayer(); characterThemeCubit = _MockCharacterThemeCubit(); - platformHelper = _MockPlatformHelper(); }); group('on selectCharacter status', () { @@ -129,7 +121,6 @@ void main() { child: SizedBox.shrink(), ), startGameBloc: startGameBloc, - platformHelper: platformHelper, ); await tester.pumpAndSettle(); @@ -222,7 +213,6 @@ void main() { child: SizedBox.shrink(), ), startGameBloc: startGameBloc, - platformHelper: platformHelper, ); await tester.pumpAndSettle(); @@ -254,7 +244,6 @@ void main() { ), startGameBloc: startGameBloc, pinballAudioPlayer: pinballAudioPlayer, - platformHelper: platformHelper, ); await tester.pumpAndSettle();