diff --git a/lib/game/behaviors/behaviors.dart b/lib/game/behaviors/behaviors.dart index 301bc61e..5900f2b3 100644 --- a/lib/game/behaviors/behaviors.dart +++ b/lib/game/behaviors/behaviors.dart @@ -1,5 +1,6 @@ export 'ball_spawning_behavior.dart'; export 'ball_theming_behavior.dart'; +export 'bonus_ball_spawning_behavior.dart'; export 'bonus_noise_behavior.dart'; export 'bumper_noise_behavior.dart'; export 'camera_focusing_behavior.dart'; diff --git a/lib/game/behaviors/bonus_ball_spawning_behavior.dart b/lib/game/behaviors/bonus_ball_spawning_behavior.dart new file mode 100644 index 00000000..26fe423d --- /dev/null +++ b/lib/game/behaviors/bonus_ball_spawning_behavior.dart @@ -0,0 +1,30 @@ +import 'package:flame/components.dart'; +import 'package:pinball/select_character/select_character.dart'; +import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_flame/pinball_flame.dart'; + +/// {@template bonus_ball_spawning_behavior} +/// After a duration, spawns a bonus ball from the [DinoWalls] and boosts it +/// into the middle of the board. +/// {@endtemplate} +class BonusBallSpawningBehavior extends TimerComponent with HasGameRef { + /// {@macro bonus_ball_spawning_behavior} + BonusBallSpawningBehavior() + : super( + period: 5, + removeOnFinish: true, + ); + + @override + void onTick() { + final characterTheme = readBloc() + .state + .characterTheme; + gameRef.descendants().whereType().single.add( + Ball(assetPath: characterTheme.ball.keyName) + ..add(BallImpulsingBehavior(impulse: Vector2(-40, 0))) + ..initialPosition = Vector2(29.2, -24.5) + ..zIndex = ZIndexes.ballOnBoard, + ); + } +} diff --git a/lib/game/behaviors/bonus_noise_behavior.dart b/lib/game/behaviors/bonus_noise_behavior.dart index 70c8ad3e..c071f064 100644 --- a/lib/game/behaviors/bonus_noise_behavior.dart +++ b/lib/game/behaviors/bonus_noise_behavior.dart @@ -25,10 +25,13 @@ class BonusNoiseBehavior extends Component { audioPlayer.play(PinballAudio.sparky); break; case GameBonus.dinoChomp: + audioPlayer.play(PinballAudio.dino); break; case GameBonus.androidSpaceship: + audioPlayer.play(PinballAudio.android); break; case GameBonus.dashNest: + audioPlayer.play(PinballAudio.dash); break; } }, diff --git a/lib/game/components/backbox/backbox.dart b/lib/game/components/backbox/backbox.dart index b3743df3..69f68a58 100644 --- a/lib/game/components/backbox/backbox.dart +++ b/lib/game/components/backbox/backbox.dart @@ -5,27 +5,37 @@ import 'package:flutter/material.dart'; import 'package:leaderboard_repository/leaderboard_repository.dart'; import 'package:pinball/game/components/backbox/bloc/backbox_bloc.dart'; import 'package:pinball/game/components/backbox/displays/displays.dart'; +import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_theme/pinball_theme.dart' hide Assets; +import 'package:platform_helper/platform_helper.dart'; /// {@template backbox} /// The [Backbox] of the pinball machine. /// {@endtemplate} -class Backbox extends PositionComponent with ZIndex { +class Backbox extends PositionComponent with ZIndex, HasGameRef { /// {@macro backbox} Backbox({ required LeaderboardRepository leaderboardRepository, - }) : _bloc = BackboxBloc(leaderboardRepository: leaderboardRepository); + required List? entries, + }) : _bloc = BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: entries, + ), + _platformHelper = PlatformHelper(); /// {@macro backbox} @visibleForTesting Backbox.test({ required BackboxBloc bloc, - }) : _bloc = bloc; + required PlatformHelper platformHelper, + }) : _bloc = bloc, + _platformHelper = platformHelper; late final Component _display; final BackboxBloc _bloc; + final PlatformHelper _platformHelper; late StreamSubscription _subscription; @override @@ -34,8 +44,6 @@ class Backbox extends PositionComponent with ZIndex { anchor = Anchor.bottomCenter; zIndex = ZIndexes.backbox; - _bloc.add(LeaderboardRequested()); - await add(_BackboxSpriteComponent()); await add(_display = Component()); _build(_bloc.state); @@ -58,6 +66,9 @@ class Backbox extends PositionComponent with ZIndex { } else if (state is LeaderboardSuccessState) { _display.add(LeaderboardDisplay(entries: state.entries)); } else if (state is InitialsFormState) { + if (_platformHelper.isMobile) { + gameRef.overlays.add(PinballGame.mobileControlsOverlay); + } _display.add( InitialsInputDisplay( score: state.score, diff --git a/lib/game/components/backbox/bloc/backbox_bloc.dart b/lib/game/components/backbox/bloc/backbox_bloc.dart index b3952a0c..7afd34de 100644 --- a/lib/game/components/backbox/bloc/backbox_bloc.dart +++ b/lib/game/components/backbox/bloc/backbox_bloc.dart @@ -14,8 +14,13 @@ class BackboxBloc extends Bloc { /// {@macro backbox_bloc} BackboxBloc({ required LeaderboardRepository leaderboardRepository, + required List? initialEntries, }) : _leaderboardRepository = leaderboardRepository, - super(LoadingState()) { + super( + initialEntries != null + ? LeaderboardSuccessState(entries: initialEntries) + : LeaderboardFailureState(), + ) { on(_onPlayerInitialsRequested); on(_onPlayerInitialsSubmitted); on(_onLeaderboardRequested); diff --git a/lib/game/components/bottom_group.dart b/lib/game/components/bottom_group.dart index 4c6b2822..bc644f96 100644 --- a/lib/game/components/bottom_group.dart +++ b/lib/game/components/bottom_group.dart @@ -1,6 +1,5 @@ import 'package:flame/components.dart'; import 'package:pinball/game/behaviors/behaviors.dart'; -import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; @@ -40,7 +39,7 @@ class _BottomGroupSide extends Component { final direction = _side.direction; final centerXAdjustment = _side.isLeft ? -0.45 : -6.8; - final flipper = ControlledFlipper( + final flipper = Flipper( side: _side, )..initialPosition = Vector2((11.6 * direction) + centerXAdjustment, 43.6); final baseboard = Baseboard(side: _side) diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart index 08dc5cb0..324f379a 100644 --- a/lib/game/components/components.dart +++ b/lib/game/components/components.dart @@ -1,7 +1,6 @@ export 'android_acres/android_acres.dart'; export 'backbox/backbox.dart'; export 'bottom_group.dart'; -export 'controlled_flipper.dart'; export 'controlled_plunger.dart'; export 'dino_desert/dino_desert.dart'; export 'drain/drain.dart'; diff --git a/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart b/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart index f37299c7..bf1b52c4 100644 --- a/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart +++ b/lib/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior.dart @@ -1,7 +1,7 @@ import 'package:flame/components.dart'; import 'package:flame_bloc/flame_bloc.dart'; +import 'package:pinball/game/behaviors/behaviors.dart'; import 'package:pinball/game/game.dart'; -import 'package:pinball/select_character/select_character.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; @@ -22,7 +22,6 @@ class FlutterForestBonusBehavior extends Component final bumpers = parent.children.whereType(); final signpost = parent.firstChild()!; final animatronic = parent.firstChild()!; - final canvas = gameRef.descendants().whereType().single; for (final bumper in bumpers) { bumper.bloc.stream.listen((state) { @@ -38,15 +37,7 @@ class FlutterForestBonusBehavior extends Component if (signpost.bloc.isFullyProgressed()) { bloc.add(const BonusActivated(GameBonus.dashNest)); - final characterTheme = - readBloc() - .state - .characterTheme; - canvas.add( - Ball(assetPath: characterTheme.ball.keyName) - ..initialPosition = Vector2(29.2, -24.5) - ..zIndex = ZIndexes.ballOnBoard, - ); + add(BonusBallSpawningBehavior()); animatronic.playing = true; signpost.bloc.onProgressed(); } diff --git a/lib/game/components/game_bloc_status_listener.dart b/lib/game/components/game_bloc_status_listener.dart index 81da96d5..84627eb0 100644 --- a/lib/game/components/game_bloc_status_listener.dart +++ b/lib/game/components/game_bloc_status_listener.dart @@ -3,6 +3,7 @@ import 'package:flame_bloc/flame_bloc.dart'; import 'package:pinball/game/game.dart'; 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'; /// Listens to the [GameBloc] and updates the game accordingly. @@ -20,6 +21,11 @@ class GameBlocStatusListener extends Component break; case GameStatus.playing: readProvider().play(PinballAudio.backgroundMusic); + gameRef + .descendants() + .whereType() + .forEach(_addFlipperKeyControls); + gameRef.overlays.remove(PinballGame.playButtonOverlay); break; case GameStatus.gameOver: @@ -30,7 +36,20 @@ class GameBlocStatusListener extends Component .state .characterTheme, ); + + gameRef + .descendants() + .whereType() + .forEach(_removeFlipperKeyControls); break; } } + + void _addFlipperKeyControls(Flipper flipper) => + flipper.add(FlipperKeyControllingBehavior()); + + void _removeFlipperKeyControls(Flipper flipper) => flipper + .descendants() + .whereType() + .forEach(flipper.remove); } diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart index c6ca8033..5e89b0cb 100644 --- a/lib/game/pinball_game.dart +++ b/lib/game/pinball_game.dart @@ -37,6 +37,9 @@ class PinballGame extends PinballForge2DGame /// Identifier of the play button overlay static const playButtonOverlay = 'play_button'; + /// Identifier of the mobile controls overlay + static const mobileControlsOverlay = 'mobile_controls'; + @override Color backgroundColor() => Colors.transparent; @@ -52,6 +55,18 @@ class PinballGame extends PinballForge2DGame final GameBloc _gameBloc; + List? _entries; + + Future preFetchLeaderboard() async { + try { + _entries = await leaderboardRepository.fetchTop10Leaderboard(); + } catch (_) { + // An initial null leaderboard means that we couldn't fetch + // the entries for the [Backbox] and it will show the relevant display. + _entries = null; + } + } + @override Future onLoad() async { await add( @@ -88,7 +103,10 @@ class PinballGame extends PinballForge2DGame children: [ BoardBackgroundSpriteComponent(), Boundaries(), - Backbox(leaderboardRepository: leaderboardRepository), + Backbox( + leaderboardRepository: leaderboardRepository, + entries: _entries, + ), GoogleWord(position: Vector2(-4.45, 1.8)), Multipliers(), Multiballs(), diff --git a/lib/game/view/pinball_game_page.dart b/lib/game/view/pinball_game_page.dart index c67b2d10..bb190668 100644 --- a/lib/game/view/pinball_game_page.dart +++ b/lib/game/view/pinball_game_page.dart @@ -50,6 +50,7 @@ class PinballGamePage extends StatelessWidget { ); final loadables = [ + game.preFetchLeaderboard(), ...game.preLoadAssets(), ...player.load(), ...BonusAnimation.loadAssets(), @@ -122,6 +123,14 @@ class PinballGameLoadedView extends StatelessWidget { child: PlayButtonOverlay(), ); }, + PinballGame.mobileControlsOverlay: (context, game) { + return Positioned( + bottom: 0, + left: 0, + right: 0, + child: MobileControls(game: game), + ); + }, }, ), ), diff --git a/lib/game/view/widgets/mobile_controls.dart b/lib/game/view/widgets/mobile_controls.dart new file mode 100644 index 00000000..c5761eb6 --- /dev/null +++ b/lib/game/view/widgets/mobile_controls.dart @@ -0,0 +1,46 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:pinball/game/game.dart'; +import 'package:pinball/l10n/l10n.dart'; +import 'package:pinball_flame/pinball_flame.dart'; +import 'package:pinball_ui/pinball_ui.dart'; + +/// {@template mobile_controls} +/// Widget with the controls used to enable the user initials input on mobile. +/// {@endtemplate} +class MobileControls extends StatelessWidget { + /// {@macro mobile_controls} + const MobileControls({ + Key? key, + required this.game, + }) : super(key: key); + + /// Game instance + final PinballGame game; + + @override + Widget build(BuildContext context) { + final l10n = AppLocalizations.of(context); + return Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + MobileDpad( + onTapUp: () => game.triggerVirtualKeyUp(LogicalKeyboardKey.arrowUp), + onTapDown: () => game.triggerVirtualKeyUp( + LogicalKeyboardKey.arrowDown, + ), + onTapLeft: () => game.triggerVirtualKeyUp( + LogicalKeyboardKey.arrowLeft, + ), + onTapRight: () => game.triggerVirtualKeyUp( + LogicalKeyboardKey.arrowRight, + ), + ), + PinballButton( + text: l10n.enter, + onTap: () => game.triggerVirtualKeyUp(LogicalKeyboardKey.enter), + ), + ], + ); + } +} diff --git a/lib/game/view/widgets/mobile_dpad.dart b/lib/game/view/widgets/mobile_dpad.dart new file mode 100644 index 00000000..abad496b --- /dev/null +++ b/lib/game/view/widgets/mobile_dpad.dart @@ -0,0 +1,75 @@ +import 'package:flutter/material.dart'; +import 'package:pinball_ui/pinball_ui.dart'; + +/// {@template mobile_dpad} +/// Widget rendering 4 directional input arrows. +/// {@endtemplate} +class MobileDpad extends StatelessWidget { + /// {@template mobile_dpad} + const MobileDpad({ + Key? key, + required this.onTapUp, + required this.onTapDown, + required this.onTapLeft, + required this.onTapRight, + }) : super(key: key); + + static const _size = 180.0; + + /// Called when dpad up is pressed + final VoidCallback onTapUp; + + /// Called when dpad down is pressed + final VoidCallback onTapDown; + + /// Called when dpad left is pressed + final VoidCallback onTapLeft; + + /// Called when dpad right is pressed + final VoidCallback onTapRight; + + @override + Widget build(BuildContext context) { + return SizedBox( + width: _size, + height: _size, + child: Column( + children: [ + Row( + children: [ + const Spacer(), + PinballDpadButton( + direction: PinballDpadDirection.up, + onTap: onTapUp, + ), + const Spacer(), + ], + ), + Row( + children: [ + PinballDpadButton( + direction: PinballDpadDirection.left, + onTap: onTapLeft, + ), + const Spacer(), + PinballDpadButton( + direction: PinballDpadDirection.right, + onTap: onTapRight, + ), + ], + ), + Row( + children: [ + const Spacer(), + PinballDpadButton( + direction: PinballDpadDirection.down, + onTap: onTapDown, + ), + const Spacer(), + ], + ), + ], + ), + ); + } +} diff --git a/lib/game/view/widgets/widgets.dart b/lib/game/view/widgets/widgets.dart index 5d1fccf8..2a04670f 100644 --- a/lib/game/view/widgets/widgets.dart +++ b/lib/game/view/widgets/widgets.dart @@ -1,5 +1,7 @@ export 'bonus_animation.dart'; export 'game_hud.dart'; +export 'mobile_controls.dart'; +export 'mobile_dpad.dart'; export 'play_button_overlay.dart'; export 'round_count_display.dart'; export 'score_view.dart'; diff --git a/lib/how_to_play/widgets/how_to_play_dialog.dart b/lib/how_to_play/widgets/how_to_play_dialog.dart index 0113319e..55aff1db 100644 --- a/lib/how_to_play/widgets/how_to_play_dialog.dart +++ b/lib/how_to_play/widgets/how_to_play_dialog.dart @@ -240,7 +240,7 @@ class _DesktopFlipperControls extends StatelessWidget { children: [ Text( l10n.flipperControls, - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.headline4, ), const SizedBox(height: 10), Column( diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb index aa1a24f6..839da492 100644 --- a/lib/l10n/arb/app_en.arb +++ b/lib/l10n/arb/app_en.arb @@ -151,5 +151,9 @@ "ioPinball": "I/O Pinball", "@ioPinball": { "description": "I/O Pinball - Name of the game" + }, + "enter": "Enter", + "@enter": { + "description": "Text shown on the mobile controls enter button" } } diff --git a/packages/pinball_audio/assets/sfx/android.mp3 b/packages/pinball_audio/assets/sfx/android.mp3 new file mode 100644 index 00000000..33bebe07 Binary files /dev/null and b/packages/pinball_audio/assets/sfx/android.mp3 differ diff --git a/packages/pinball_audio/assets/sfx/dash.mp3 b/packages/pinball_audio/assets/sfx/dash.mp3 new file mode 100644 index 00000000..1180fc4e Binary files /dev/null and b/packages/pinball_audio/assets/sfx/dash.mp3 differ diff --git a/packages/pinball_audio/assets/sfx/dino.mp3 b/packages/pinball_audio/assets/sfx/dino.mp3 new file mode 100644 index 00000000..e8e4a1d5 Binary files /dev/null and b/packages/pinball_audio/assets/sfx/dino.mp3 differ diff --git a/packages/pinball_audio/lib/gen/assets.gen.dart b/packages/pinball_audio/lib/gen/assets.gen.dart index 08e83d87..bdd8e09e 100644 --- a/packages/pinball_audio/lib/gen/assets.gen.dart +++ b/packages/pinball_audio/lib/gen/assets.gen.dart @@ -14,8 +14,11 @@ class $AssetsMusicGen { class $AssetsSfxGen { const $AssetsSfxGen(); + String get android => 'assets/sfx/android.mp3'; String get bumperA => 'assets/sfx/bumper_a.mp3'; String get bumperB => 'assets/sfx/bumper_b.mp3'; + String get dash => 'assets/sfx/dash.mp3'; + String get dino => 'assets/sfx/dino.mp3'; String get gameOverVoiceOver => 'assets/sfx/game_over_voice_over.mp3'; String get google => 'assets/sfx/google.mp3'; String get ioPinballVoiceOver => 'assets/sfx/io_pinball_voice_over.mp3'; diff --git a/packages/pinball_audio/lib/src/pinball_audio.dart b/packages/pinball_audio/lib/src/pinball_audio.dart index 95c993c5..767fc3a6 100644 --- a/packages/pinball_audio/lib/src/pinball_audio.dart +++ b/packages/pinball_audio/lib/src/pinball_audio.dart @@ -28,6 +28,15 @@ enum PinballAudio { /// Sparky sparky, + + /// Android + android, + + /// Dino + dino, + + /// Dash + dash, } /// Defines the contract of the creation of an [AudioPool]. @@ -169,6 +178,21 @@ class PinballPlayer { playSingleAudio: _playSingleAudio, path: Assets.sfx.sparky, ), + PinballAudio.dino: _SimplePlayAudio( + preCacheSingleAudio: _preCacheSingleAudio, + playSingleAudio: _playSingleAudio, + path: Assets.sfx.dino, + ), + PinballAudio.dash: _SimplePlayAudio( + preCacheSingleAudio: _preCacheSingleAudio, + playSingleAudio: _playSingleAudio, + path: Assets.sfx.dash, + ), + PinballAudio.android: _SimplePlayAudio( + preCacheSingleAudio: _preCacheSingleAudio, + playSingleAudio: _playSingleAudio, + path: Assets.sfx.android, + ), PinballAudio.launcher: _SimplePlayAudio( preCacheSingleAudio: _preCacheSingleAudio, playSingleAudio: _playSingleAudio, diff --git a/packages/pinball_audio/test/src/pinball_audio_test.dart b/packages/pinball_audio/test/src/pinball_audio_test.dart index 39060eb2..e95eb8f7 100644 --- a/packages/pinball_audio/test/src/pinball_audio_test.dart +++ b/packages/pinball_audio/test/src/pinball_audio_test.dart @@ -145,6 +145,18 @@ void main() { () => preCacheSingleAudio .onCall('packages/pinball_audio/assets/sfx/sparky.mp3'), ).called(1); + verify( + () => preCacheSingleAudio + .onCall('packages/pinball_audio/assets/sfx/dino.mp3'), + ).called(1); + verify( + () => preCacheSingleAudio + .onCall('packages/pinball_audio/assets/sfx/android.mp3'), + ).called(1); + verify( + () => preCacheSingleAudio + .onCall('packages/pinball_audio/assets/sfx/dash.mp3'), + ).called(1); verify( () => preCacheSingleAudio.onCall( 'packages/pinball_audio/assets/sfx/io_pinball_voice_over.mp3', @@ -239,6 +251,42 @@ void main() { }); }); + group('dino', () { + test('plays the correct file', () async { + await Future.wait(player.load()); + player.play(PinballAudio.dino); + + verify( + () => playSingleAudio + .onCall('packages/pinball_audio/${Assets.sfx.dino}'), + ).called(1); + }); + }); + + group('android', () { + test('plays the correct file', () async { + await Future.wait(player.load()); + player.play(PinballAudio.android); + + verify( + () => playSingleAudio + .onCall('packages/pinball_audio/${Assets.sfx.android}'), + ).called(1); + }); + }); + + group('dash', () { + test('plays the correct file', () async { + await Future.wait(player.load()); + player.play(PinballAudio.dash); + + verify( + () => playSingleAudio + .onCall('packages/pinball_audio/${Assets.sfx.dash}'), + ).called(1); + }); + }); + group('launcher', () { test('plays the correct file', () async { await Future.wait(player.load()); diff --git a/packages/pinball_components/assets/images/boundary/bottom.png b/packages/pinball_components/assets/images/boundary/bottom.png index 806f7051..523e6156 100644 Binary files a/packages/pinball_components/assets/images/boundary/bottom.png and b/packages/pinball_components/assets/images/boundary/bottom.png differ diff --git a/packages/pinball_components/assets/images/dino/top-wall.png b/packages/pinball_components/assets/images/dino/top-wall.png index 7ee69411..76dc4f12 100644 Binary files a/packages/pinball_components/assets/images/dino/top-wall.png and b/packages/pinball_components/assets/images/dino/top-wall.png differ diff --git a/packages/pinball_components/lib/src/components/ball/behaviors/ball_impulsing_behavior.dart b/packages/pinball_components/lib/src/components/ball/behaviors/ball_impulsing_behavior.dart new file mode 100644 index 00000000..d875ef7c --- /dev/null +++ b/packages/pinball_components/lib/src/components/ball/behaviors/ball_impulsing_behavior.dart @@ -0,0 +1,22 @@ +import 'package:flame/components.dart'; +import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_flame/pinball_flame.dart'; + +/// {@template ball_impulsing_behavior} +/// Impulses the [Ball] in a given direction. +/// {@endtemplate} +class BallImpulsingBehavior extends Component with ParentIsA { + /// {@macro ball_impulsing_behavior} + BallImpulsingBehavior({ + required Vector2 impulse, + }) : _impulse = impulse; + + final Vector2 _impulse; + + @override + Future onLoad() async { + await super.onLoad(); + parent.body.linearVelocity = _impulse; + shouldRemove = true; + } +} diff --git a/packages/pinball_components/lib/src/components/ball/behaviors/behaviors.dart b/packages/pinball_components/lib/src/components/ball/behaviors/behaviors.dart index 1068a20e..d2be36a9 100644 --- a/packages/pinball_components/lib/src/components/ball/behaviors/behaviors.dart +++ b/packages/pinball_components/lib/src/components/ball/behaviors/behaviors.dart @@ -1,3 +1,4 @@ export 'ball_gravitating_behavior.dart'; +export 'ball_impulsing_behavior.dart'; export 'ball_scaling_behavior.dart'; export 'ball_turbo_charging_behavior.dart'; diff --git a/packages/pinball_components/lib/src/components/components.dart b/packages/pinball_components/lib/src/components/components.dart index 873703f1..b098f359 100644 --- a/packages/pinball_components/lib/src/components/components.dart +++ b/packages/pinball_components/lib/src/components/components.dart @@ -15,7 +15,7 @@ export 'dino_walls.dart'; export 'error_component.dart'; export 'fire_effect.dart'; export 'flapper/flapper.dart'; -export 'flipper.dart'; +export 'flipper/flipper.dart'; export 'google_letter/google_letter.dart'; export 'initial_position.dart'; export 'joint_anchor.dart'; diff --git a/packages/pinball_components/lib/src/components/flipper/behaviors/behaviors.dart b/packages/pinball_components/lib/src/components/flipper/behaviors/behaviors.dart new file mode 100644 index 00000000..ef3630e7 --- /dev/null +++ b/packages/pinball_components/lib/src/components/flipper/behaviors/behaviors.dart @@ -0,0 +1,2 @@ +export 'flipper_jointing_behavior.dart'; +export 'flipper_key_controlling_behavior.dart'; diff --git a/packages/pinball_components/lib/src/components/flipper/behaviors/flipper_jointing_behavior.dart b/packages/pinball_components/lib/src/components/flipper/behaviors/flipper_jointing_behavior.dart new file mode 100644 index 00000000..c0574f6c --- /dev/null +++ b/packages/pinball_components/lib/src/components/flipper/behaviors/flipper_jointing_behavior.dart @@ -0,0 +1,103 @@ +import 'package:flame/components.dart'; +import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_flame/pinball_flame.dart'; + +/// Joints the [Flipper] to allow pivoting around one end. +class FlipperJointingBehavior extends Component + with ParentIsA, HasGameRef { + late final RevoluteJoint _joint; + + @override + Future onLoad() async { + await super.onLoad(); + + final anchor = _FlipperAnchor(flipper: parent); + await add(anchor); + + final jointDef = _FlipperAnchorRevoluteJointDef( + flipper: parent, + anchor: anchor, + ); + _joint = _FlipperJoint(jointDef); + parent.world.createJoint(_joint); + } + + @override + void onMount() { + gameRef.ready().whenComplete( + () => parent.body.joints.whereType<_FlipperJoint>().first.unlock(), + ); + } +} + +/// {@template flipper_anchor} +/// [JointAnchor] positioned at the end of a [Flipper]. +/// +/// The end of a [Flipper] depends on its [Flipper.side]. +/// {@endtemplate} +class _FlipperAnchor extends JointAnchor { + /// {@macro flipper_anchor} + _FlipperAnchor({ + required Flipper flipper, + }) { + initialPosition = Vector2( + (Flipper.size.x * flipper.side.direction) / 2 - + (1.65 * flipper.side.direction), + -0.15, + ); + } +} + +/// {@template flipper_anchor_revolute_joint_def} +/// Hinges one end of [Flipper] to a [_FlipperAnchor] to achieve a potivoting +/// motion. +/// {@endtemplate} +class _FlipperAnchorRevoluteJointDef extends RevoluteJointDef { + /// {@macro flipper_anchor_revolute_joint_def} + _FlipperAnchorRevoluteJointDef({ + required Flipper flipper, + required _FlipperAnchor anchor, + }) : side = flipper.side { + enableLimit = true; + initialize( + flipper.body, + anchor.body, + flipper.body.position + anchor.body.position, + ); + } + + final BoardSide side; +} + +/// {@template flipper_joint} +/// [RevoluteJoint] that controls the pivoting motion of a [Flipper]. +/// {@endtemplate} +class _FlipperJoint extends RevoluteJoint { + /// {@macro flipper_joint} + _FlipperJoint(_FlipperAnchorRevoluteJointDef def) + : side = def.side, + super(def) { + lock(); + } + + /// Half the angle of the arc motion. + static const _halfSweepingAngle = 0.611; + + final BoardSide side; + + /// Locks the [Flipper] to its resting position. + /// + /// The joint is locked when initialized in order to force the [Flipper] + /// at its resting position. + void lock() { + final angle = _halfSweepingAngle * side.direction; + setLimits(angle, angle); + } + + /// Unlocks the [Flipper] from its resting position. + void unlock() { + const angle = _halfSweepingAngle; + setLimits(-angle, angle); + } +} diff --git a/lib/game/components/controlled_flipper.dart b/packages/pinball_components/lib/src/components/flipper/behaviors/flipper_key_controlling_behavior.dart similarity index 50% rename from lib/game/components/controlled_flipper.dart rename to packages/pinball_components/lib/src/components/flipper/behaviors/flipper_key_controlling_behavior.dart index 1d5502c6..95566e75 100644 --- a/lib/game/components/controlled_flipper.dart +++ b/packages/pinball_components/lib/src/components/flipper/behaviors/flipper_key_controlling_behavior.dart @@ -1,49 +1,33 @@ import 'package:flame/components.dart'; -import 'package:flame_bloc/flame_bloc.dart'; import 'package:flutter/services.dart'; -import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_flame/pinball_flame.dart'; -/// {@template controlled_flipper} -/// A [Flipper] with a [FlipperController] attached. -/// {@endtemplate} -class ControlledFlipper extends Flipper with Controls { - /// {@macro controlled_flipper} - ControlledFlipper({ - required BoardSide side, - }) : super(side: side) { - controller = FlipperController(this); - } -} - -/// {@template flipper_controller} -/// A [ComponentController] that controls a [Flipper]s movement. -/// {@endtemplate} -class FlipperController extends ComponentController - with KeyboardHandler, FlameBlocReader { - /// {@macro flipper_controller} - FlipperController(Flipper flipper) - : _keys = flipper.side.flipperKeys, - super(flipper); - +/// Allows controlling the [Flipper]'s movement with keyboard input. +class FlipperKeyControllingBehavior extends Component + with KeyboardHandler, ParentIsA { /// The [LogicalKeyboardKey]s that will control the [Flipper]. /// /// [onKeyEvent] method listens to when one of these keys is pressed. - final List _keys; + late final List _keys; + + @override + Future onLoad() async { + await super.onLoad(); + _keys = parent.side.flipperKeys; + } @override bool onKeyEvent( RawKeyEvent event, Set keysPressed, ) { - if (!bloc.state.status.isPlaying) return true; if (!_keys.contains(event.logicalKey)) return true; if (event is RawKeyDownEvent) { - component.moveUp(); + parent.moveUp(); } else if (event is RawKeyUpEvent) { - component.moveDown(); + parent.moveDown(); } return false; diff --git a/packages/pinball_components/lib/src/components/flipper.dart b/packages/pinball_components/lib/src/components/flipper/flipper.dart similarity index 56% rename from packages/pinball_components/lib/src/components/flipper.dart rename to packages/pinball_components/lib/src/components/flipper/flipper.dart index ca033440..280c157f 100644 --- a/packages/pinball_components/lib/src/components/flipper.dart +++ b/packages/pinball_components/lib/src/components/flipper/flipper.dart @@ -2,8 +2,11 @@ import 'dart:async'; import 'package:flame/components.dart'; import 'package:flame_forge2d/flame_forge2d.dart'; +import 'package:flutter/foundation.dart'; import 'package:pinball_components/pinball_components.dart'; +export 'behaviors/behaviors.dart'; + /// {@template flipper} /// A bat, typically found in pairs at the bottom of the board. /// @@ -15,9 +18,18 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { required this.side, }) : super( renderBody: false, - children: [_FlipperSpriteComponent(side: side)], + children: [ + _FlipperSpriteComponent(side: side), + FlipperJointingBehavior(), + ], ); + /// Creates a [Flipper] without any children. + /// + /// This can be used for testing [Flipper]'s behaviors in isolation. + @visibleForTesting + Flipper.test({required this.side}); + /// The size of the [Flipper]. static final size = Vector2(13.5, 4.3); @@ -44,19 +56,6 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { body.linearVelocity = Vector2(0, -_speed); } - /// Anchors the [Flipper] to the [RevoluteJoint] that controls its arc motion. - Future _anchorToJoint() async { - final anchor = _FlipperAnchor(flipper: this); - await add(anchor); - - final jointDef = _FlipperAnchorRevoluteJointDef( - flipper: this, - anchor: anchor, - ); - final joint = _FlipperJoint(jointDef); - world.createJoint(joint); - } - List _createFixtureDefs() { final direction = side.direction; @@ -73,7 +72,6 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { assetShadow, 0, ); - final bigCircleFixtureDef = FixtureDef(bigCircleShape); final smallCircleShape = CircleShape()..radius = size.y * 0.23; smallCircleShape.position.setValues( @@ -82,7 +80,6 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { assetShadow, 0, ); - final smallCircleFixtureDef = FixtureDef(smallCircleShape); final trapeziumVertices = side.isLeft ? [ @@ -98,26 +95,18 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { Vector2(smallCircleShape.position.x, -smallCircleShape.radius), ]; final trapezium = PolygonShape()..set(trapeziumVertices); - final trapeziumFixtureDef = FixtureDef( - trapezium, - density: 50, - friction: .1, - ); return [ - bigCircleFixtureDef, - smallCircleFixtureDef, - trapeziumFixtureDef, + FixtureDef(bigCircleShape), + FixtureDef(smallCircleShape), + FixtureDef( + trapezium, + density: 50, + friction: .1, + ), ]; } - @override - Future onLoad() async { - await super.onLoad(); - - await _anchorToJoint(); - } - @override Body createBody() { final bodyDef = BodyDef( @@ -131,15 +120,6 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition { return body; } - - @override - void onMount() { - super.onMount(); - - gameRef.ready().whenComplete( - () => body.joints.whereType<_FlipperJoint>().first.unlock(), - ); - } } class _FlipperSpriteComponent extends SpriteComponent with HasGameRef { @@ -163,73 +143,3 @@ class _FlipperSpriteComponent extends SpriteComponent with HasGameRef { size = sprite.originalSize / 10; } } - -/// {@template flipper_anchor} -/// [JointAnchor] positioned at the end of a [Flipper]. -/// -/// The end of a [Flipper] depends on its [Flipper.side]. -/// {@endtemplate} -class _FlipperAnchor extends JointAnchor { - /// {@macro flipper_anchor} - _FlipperAnchor({ - required Flipper flipper, - }) { - initialPosition = Vector2( - (Flipper.size.x * flipper.side.direction) / 2 - - (1.65 * flipper.side.direction), - -0.15, - ); - } -} - -/// {@template flipper_anchor_revolute_joint_def} -/// Hinges one end of [Flipper] to a [_FlipperAnchor] to achieve an arc motion. -/// {@endtemplate} -class _FlipperAnchorRevoluteJointDef extends RevoluteJointDef { - /// {@macro flipper_anchor_revolute_joint_def} - _FlipperAnchorRevoluteJointDef({ - required Flipper flipper, - required _FlipperAnchor anchor, - }) : side = flipper.side { - enableLimit = true; - initialize( - flipper.body, - anchor.body, - flipper.body.position + anchor.body.position, - ); - } - - final BoardSide side; -} - -/// {@template flipper_joint} -/// [RevoluteJoint] that controls the arc motion of a [Flipper]. -/// {@endtemplate} -class _FlipperJoint extends RevoluteJoint { - /// {@macro flipper_joint} - _FlipperJoint(_FlipperAnchorRevoluteJointDef def) - : side = def.side, - super(def) { - lock(); - } - - /// Half the angle of the arc motion. - static const _halfSweepingAngle = 0.611; - - final BoardSide side; - - /// Locks the [Flipper] to its resting position. - /// - /// The joint is locked when initialized in order to force the [Flipper] - /// at its resting position. - void lock() { - final angle = _halfSweepingAngle * side.direction; - setLimits(angle, angle); - } - - /// Unlocks the [Flipper] from its resting position. - void unlock() { - const angle = _halfSweepingAngle; - setLimits(-angle, angle); - } -} diff --git a/packages/pinball_components/lib/src/components/spaceship_ramp/spaceship_ramp.dart b/packages/pinball_components/lib/src/components/spaceship_ramp/spaceship_ramp.dart index 0796be92..ea7ed2e7 100644 --- a/packages/pinball_components/lib/src/components/spaceship_ramp/spaceship_ramp.dart +++ b/packages/pinball_components/lib/src/components/spaceship_ramp/spaceship_ramp.dart @@ -42,7 +42,7 @@ class SpaceshipRamp extends Component { _SpaceshipRampBackground(), _SpaceshipRampBoardOpening()..initialPosition = Vector2(3.4, -39.5), _SpaceshipRampForegroundRailing(), - _SpaceshipRampBase()..initialPosition = Vector2(3.4, -42.5), + SpaceshipRampBase()..initialPosition = Vector2(3.4, -42.5), _SpaceshipRampBackgroundRailingSpriteComponent(), SpaceshipRampArrowSpriteComponent( current: bloc.state.hits, @@ -255,9 +255,14 @@ class _SpaceshipRampBoardOpening extends BodyComponent _SpaceshipRampBoardOpeningSpriteComponent(), LayerContactBehavior(layer: Layer.spaceshipEntranceRamp) ..applyTo(['inside']), - LayerContactBehavior(layer: Layer.board)..applyTo(['outside']), - ZIndexContactBehavior(zIndex: ZIndexes.ballOnBoard) - ..applyTo(['outside']), + LayerContactBehavior( + layer: Layer.board, + onBegin: false, + )..applyTo(['outside']), + ZIndexContactBehavior( + zIndex: ZIndexes.ballOnBoard, + onBegin: false, + )..applyTo(['outside']), ZIndexContactBehavior(zIndex: ZIndexes.ballOnSpaceshipRamp) ..applyTo(['middle', 'inside']), ], @@ -426,9 +431,19 @@ class _SpaceshipRampForegroundRailingSpriteComponent extends SpriteComponent } } -class _SpaceshipRampBase extends BodyComponent with Layered, InitialPosition { - _SpaceshipRampBase() : super(renderBody: false) { - layer = Layer.board; +@visibleForTesting +class SpaceshipRampBase extends BodyComponent + with InitialPosition, ContactCallbacks { + SpaceshipRampBase() : super(renderBody: false); + + @override + void preSolve(Object other, Contact contact, Manifold oldManifold) { + super.preSolve(other, contact, oldManifold); + if (other is! Layered) return; + // Although, the Layer should already be taking care of the contact + // filtering, this is to ensure the ball doesn't collide with the ramp base + // when the filtering is calculated on different time steps. + contact.setEnabled(other.layer == Layer.board); } @override @@ -441,7 +456,7 @@ class _SpaceshipRampBase extends BodyComponent with Layered, InitialPosition { Vector2(4.1, 1.5), ], ); - final bodyDef = BodyDef(position: initialPosition); + final bodyDef = BodyDef(position: initialPosition, userData: this); return world.createBody(bodyDef)..createFixtureFromShape(shape); } } diff --git a/packages/pinball_components/lib/src/components/sparky_computer/sparky_computer.dart b/packages/pinball_components/lib/src/components/sparky_computer/sparky_computer.dart index c96c5007..966eff02 100644 --- a/packages/pinball_components/lib/src/components/sparky_computer/sparky_computer.dart +++ b/packages/pinball_components/lib/src/components/sparky_computer/sparky_computer.dart @@ -65,7 +65,7 @@ class SparkyComputer extends BodyComponent { ..setAsBox( 1, 0.1, - Vector2(-13.2, -49.9), + Vector2(-13.1, -49.7), -0.18, ); diff --git a/packages/pinball_components/sandbox/lib/stories/bottom_group/flipper_game.dart b/packages/pinball_components/sandbox/lib/stories/bottom_group/flipper_game.dart index 789fa8b4..bdb23141 100644 --- a/packages/pinball_components/sandbox/lib/stories/bottom_group/flipper_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/bottom_group/flipper_game.dart @@ -1,6 +1,4 @@ import 'package:flame/input.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; @@ -23,16 +21,6 @@ class FlipperGame extends BallGame with KeyboardEvents { - Press right arrow key or "D" to move the right flipper. '''; - static const _leftFlipperKeys = [ - LogicalKeyboardKey.arrowLeft, - LogicalKeyboardKey.keyA, - ]; - - static const _rightFlipperKeys = [ - LogicalKeyboardKey.arrowRight, - LogicalKeyboardKey.keyD, - ]; - late Flipper leftFlipper; late Flipper rightFlipper; @@ -50,32 +38,4 @@ class FlipperGame extends BallGame with KeyboardEvents { await traceAllBodies(); } - - @override - KeyEventResult onKeyEvent( - RawKeyEvent event, - Set keysPressed, - ) { - final movedLeftFlipper = _leftFlipperKeys.contains(event.logicalKey); - if (movedLeftFlipper) { - if (event is RawKeyDownEvent) { - leftFlipper.moveUp(); - } else if (event is RawKeyUpEvent) { - leftFlipper.moveDown(); - } - } - - final movedRightFlipper = _rightFlipperKeys.contains(event.logicalKey); - if (movedRightFlipper) { - if (event is RawKeyDownEvent) { - rightFlipper.moveUp(); - } else if (event is RawKeyUpEvent) { - rightFlipper.moveDown(); - } - } - - return movedLeftFlipper || movedRightFlipper - ? KeyEventResult.handled - : KeyEventResult.ignored; - } } diff --git a/packages/pinball_components/test/src/components/ball/behaviors/ball_implusing_behavior_test.dart b/packages/pinball_components/test/src/components/ball/behaviors/ball_implusing_behavior_test.dart new file mode 100644 index 00000000..53ab4553 --- /dev/null +++ b/packages/pinball_components/test/src/components/ball/behaviors/ball_implusing_behavior_test.dart @@ -0,0 +1,53 @@ +// ignore_for_file: cascade_invocations + +import 'package:flame/components.dart'; +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; + +import '../../../../helpers/helpers.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group( + 'BallImpulsingBehavior', + () { + final asset = theme.Assets.images.dash.ball.keyName; + final flameTester = FlameTester(() => TestGame([asset])); + + test('can be instantiated', () { + expect( + BallImpulsingBehavior(impulse: Vector2.zero()), + isA(), + ); + }); + + flameTester.test( + 'impulses the ball with the given velocity when loaded ' + 'and then removes itself', + (game) async { + final ball = Ball.test(); + await game.ensureAdd(ball); + final impulse = Vector2.all(1); + final behavior = BallImpulsingBehavior(impulse: impulse); + await ball.ensureAdd(behavior); + + expect( + ball.body.linearVelocity.x, + equals(impulse.x), + ); + expect( + ball.body.linearVelocity.y, + equals(impulse.y), + ); + expect( + game.descendants().whereType().isEmpty, + isTrue, + ); + }, + ); + }, + ); +} diff --git a/packages/pinball_components/test/src/components/flipper/behaviors/flipper_jointing_behavior_test.dart b/packages/pinball_components/test/src/components/flipper/behaviors/flipper_jointing_behavior_test.dart new file mode 100644 index 00000000..3d6c3b83 --- /dev/null +++ b/packages/pinball_components/test/src/components/flipper/behaviors/flipper_jointing_behavior_test.dart @@ -0,0 +1,38 @@ +// ignore_for_file: cascade_invocations + +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball_components/src/components/components.dart'; + +import '../../../../helpers/helpers.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + group('FlipperJointingBehavior', () { + final flameTester = FlameTester(TestGame.new); + + test('can be instantiated', () { + expect( + FlipperJointingBehavior(), + isA(), + ); + }); + + flameTester.test('can be loaded', (game) async { + final behavior = FlipperJointingBehavior(); + final parent = Flipper.test(side: BoardSide.left); + await game.ensureAdd(parent); + await parent.ensureAdd(behavior); + expect(parent.contains(behavior), isTrue); + }); + + flameTester.test('creates a joint', (game) async { + final behavior = FlipperJointingBehavior(); + final parent = Flipper.test(side: BoardSide.left); + await game.ensureAdd(parent); + await parent.ensureAdd(behavior); + + expect(parent.body.joints, isNotEmpty); + }); + }); +} diff --git a/packages/pinball_components/test/src/components/flipper/behaviors/flipper_key_controlling_behavior_test.dart b/packages/pinball_components/test/src/components/flipper/behaviors/flipper_key_controlling_behavior_test.dart new file mode 100644 index 00000000..11af6187 --- /dev/null +++ b/packages/pinball_components/test/src/components/flipper/behaviors/flipper_key_controlling_behavior_test.dart @@ -0,0 +1,357 @@ +// ignore_for_file: cascade_invocations + +import 'package:flame_test/flame_test.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:pinball_components/pinball_components.dart'; + +import '../../../../helpers/helpers.dart'; + +class _MockRawKeyDownEvent extends Mock implements RawKeyDownEvent { + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) { + return super.toString(); + } +} + +class _MockRawKeyUpEvent extends Mock implements RawKeyUpEvent { + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) { + return super.toString(); + } +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + group('FlipperKeyControllingBehavior', () { + final flameTester = FlameTester(TestGame.new); + + group( + 'onKeyEvent', + () { + late Flipper rightFlipper; + late Flipper leftFlipper; + + setUp(() { + rightFlipper = Flipper.test(side: BoardSide.right); + leftFlipper = Flipper.test(side: BoardSide.left); + }); + + group('on right Flipper', () { + flameTester.test( + 'moves upwards when right arrow is pressed', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowRight, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isNegative); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'moves downwards when right arrow is released', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowRight, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isPositive); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'moves upwards when D is pressed', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyD, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isNegative); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'moves downwards when D is released', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyD, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isPositive); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + + group("doesn't move when", () { + flameTester.test( + 'left arrow is pressed', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowLeft, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isZero); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'left arrow is released', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowLeft, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isZero); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'A is pressed', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyA, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isZero); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'A is released', + (game) async { + await game.ensureAdd(rightFlipper); + final behavior = FlipperKeyControllingBehavior(); + await rightFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyA, + ); + + behavior.onKeyEvent(event, {}); + + expect(rightFlipper.body.linearVelocity.y, isZero); + expect(rightFlipper.body.linearVelocity.x, isZero); + }, + ); + }); + }); + + group('on left Flipper', () { + flameTester.test( + 'moves upwards when left arrow is pressed', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowLeft, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isNegative); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'moves downwards when left arrow is released', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowLeft, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isPositive); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'moves upwards when A is pressed', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyA, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isNegative); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'moves downwards when A is released', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyA, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isPositive); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + + group("doesn't move when", () { + flameTester.test( + 'right arrow is pressed', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowRight, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isZero); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'right arrow is released', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.arrowRight, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isZero); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'D is pressed', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyDownEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyD, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isZero); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + + flameTester.test( + 'D is released', + (game) async { + await game.ensureAdd(leftFlipper); + final behavior = FlipperKeyControllingBehavior(); + await leftFlipper.ensureAdd(behavior); + + final event = _MockRawKeyUpEvent(); + when(() => event.logicalKey).thenReturn( + LogicalKeyboardKey.keyD, + ); + + behavior.onKeyEvent(event, {}); + + expect(leftFlipper.body.linearVelocity.y, isZero); + expect(leftFlipper.body.linearVelocity.x, isZero); + }, + ); + }); + }); + }, + ); + }); +} diff --git a/packages/pinball_components/test/src/components/flipper_test.dart b/packages/pinball_components/test/src/components/flipper/flipper_test.dart similarity index 97% rename from packages/pinball_components/test/src/components/flipper_test.dart rename to packages/pinball_components/test/src/components/flipper/flipper_test.dart index 53b0e108..4569f3ec 100644 --- a/packages/pinball_components/test/src/components/flipper_test.dart +++ b/packages/pinball_components/test/src/components/flipper/flipper_test.dart @@ -6,7 +6,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_theme/pinball_theme.dart' as theme; -import '../../helpers/helpers.dart'; +import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -36,7 +36,7 @@ void main() { verify: (game, tester) async { await expectLater( find.byGame(), - matchesGoldenFile('golden/flipper.png'), + matchesGoldenFile('../golden/flipper.png'), ); }, ); diff --git a/packages/pinball_components/test/src/components/golden/boundaries.png b/packages/pinball_components/test/src/components/golden/boundaries.png index 68f57a86..e8075f63 100644 Binary files a/packages/pinball_components/test/src/components/golden/boundaries.png and b/packages/pinball_components/test/src/components/golden/boundaries.png differ diff --git a/packages/pinball_components/test/src/components/golden/dino-walls.png b/packages/pinball_components/test/src/components/golden/dino-walls.png index 31b317c1..1a50449d 100644 Binary files a/packages/pinball_components/test/src/components/golden/dino-walls.png and b/packages/pinball_components/test/src/components/golden/dino-walls.png differ diff --git a/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart b/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart index b74cfb88..7bd18aeb 100644 --- a/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart +++ b/packages/pinball_components/test/src/components/spaceship_ramp/spaceship_ramp_test.dart @@ -2,6 +2,7 @@ import 'package:bloc_test/bloc_test.dart'; import 'package:flame/components.dart'; +import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; @@ -12,6 +13,12 @@ import '../../../helpers/helpers.dart'; class _MockSpaceshipRampCubit extends Mock implements SpaceshipRampCubit {} +class _MockBall extends Mock implements Ball {} + +class _MockContact extends Mock implements Contact {} + +class _MockManifold extends Mock implements Manifold {} + void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ @@ -275,4 +282,46 @@ void main() { }); }); }); + + group('SpaceshipRampBase', () { + test('can be instantiated', () { + expect(SpaceshipRampBase(), isA()); + }); + + flameTester.test('can be loaded', (game) async { + final component = SpaceshipRampBase(); + await game.ensureAdd(component); + expect(game.children, contains(component)); + }); + + flameTester.test( + 'postSolves disables contact when ball is not on Layer.board', + (game) async { + final ball = _MockBall(); + final contact = _MockContact(); + when(() => ball.layer).thenReturn(Layer.spaceshipEntranceRamp); + final component = SpaceshipRampBase(); + await game.ensureAdd(component); + + component.preSolve(ball, contact, _MockManifold()); + + verify(() => contact.setEnabled(false)).called(1); + }, + ); + + flameTester.test( + 'postSolves enables contact when ball is on Layer.board', + (game) async { + final ball = _MockBall(); + final contact = _MockContact(); + when(() => ball.layer).thenReturn(Layer.board); + final component = SpaceshipRampBase(); + await game.ensureAdd(component); + + component.preSolve(ball, contact, _MockManifold()); + + verify(() => contact.setEnabled(true)).called(1); + }, + ); + }); } diff --git a/packages/pinball_flame/lib/src/behaviors/layer_contact_behavior.dart b/packages/pinball_flame/lib/src/behaviors/layer_contact_behavior.dart index a73b94a5..ef475bc9 100644 --- a/packages/pinball_flame/lib/src/behaviors/layer_contact_behavior.dart +++ b/packages/pinball_flame/lib/src/behaviors/layer_contact_behavior.dart @@ -6,15 +6,20 @@ import 'package:pinball_flame/pinball_flame.dart'; /// {@endtemplate} class LayerContactBehavior extends ContactBehavior { /// {@macro layer_contact_behavior} - LayerContactBehavior({required Layer layer}) : _layer = layer; - - final Layer _layer; + LayerContactBehavior({ + required Layer layer, + bool onBegin = true, + }) { + if (onBegin) { + onBeginContact = (other, _) => _changeLayer(other, layer); + } else { + onEndContact = (other, _) => _changeLayer(other, layer); + } + } - @override - void beginContact(Object other, Contact contact) { - super.beginContact(other, contact); + void _changeLayer(Object other, Layer layer) { if (other is! Layered) return; - if (other.layer == _layer) return; - other.layer = _layer; + if (other.layer == layer) return; + other.layer = layer; } } diff --git a/packages/pinball_flame/lib/src/behaviors/z_index_contact_behavior.dart b/packages/pinball_flame/lib/src/behaviors/z_index_contact_behavior.dart index ea9bfcad..c763e2cf 100644 --- a/packages/pinball_flame/lib/src/behaviors/z_index_contact_behavior.dart +++ b/packages/pinball_flame/lib/src/behaviors/z_index_contact_behavior.dart @@ -6,15 +6,20 @@ import 'package:pinball_flame/pinball_flame.dart'; /// {@endtemplate} class ZIndexContactBehavior extends ContactBehavior { /// {@macro layer_contact_behavior} - ZIndexContactBehavior({required int zIndex}) : _zIndex = zIndex; - - final int _zIndex; + ZIndexContactBehavior({ + required int zIndex, + bool onBegin = true, + }) { + if (onBegin) { + onBeginContact = (other, _) => _changeZIndex(other, zIndex); + } else { + onEndContact = (other, _) => _changeZIndex(other, zIndex); + } + } - @override - void beginContact(Object other, Contact contact) { - super.beginContact(other, contact); + void _changeZIndex(Object other, int zIndex) { if (other is! ZIndex) return; - if (other.zIndex == _zIndex) return; - other.zIndex = _zIndex; + if (other.zIndex == zIndex) return; + other.zIndex = zIndex; } } diff --git a/packages/pinball_flame/lib/src/keyboard_input_controller.dart b/packages/pinball_flame/lib/src/keyboard_input_controller.dart index 8249e599..b0d64ee6 100644 --- a/packages/pinball_flame/lib/src/keyboard_input_controller.dart +++ b/packages/pinball_flame/lib/src/keyboard_input_controller.dart @@ -1,4 +1,5 @@ import 'package:flame/components.dart'; +import 'package:flame/game.dart'; import 'package:flutter/services.dart'; /// The signature for a key handle function @@ -18,6 +19,17 @@ class KeyboardInputController extends Component with KeyboardHandler { final Map _keyUp; final Map _keyDown; + /// Trigger a virtual key up event. + bool onVirtualKeyUp(LogicalKeyboardKey key) { + final handler = _keyUp[key]; + + if (handler != null) { + return handler(); + } + + return true; + } + @override bool onKeyEvent(RawKeyEvent event, Set keysPressed) { final isUp = event is RawKeyUpEvent; @@ -32,3 +44,18 @@ class KeyboardInputController extends Component with KeyboardHandler { return true; } } + +/// Add the ability to virtually trigger key events to a [FlameGame]'s +/// [KeyboardInputController]. +extension VirtualKeyEvents on FlameGame { + /// Trigger a key up + void triggerVirtualKeyUp(LogicalKeyboardKey key) { + final keyControllers = descendants().whereType(); + + for (final controller in keyControllers) { + if (!controller.onVirtualKeyUp(key)) { + break; + } + } + } +} diff --git a/packages/pinball_flame/test/src/behaviors/layer_contact_behavior_test.dart b/packages/pinball_flame/test/src/behaviors/layer_contact_behavior_test.dart index 49040977..d4b7ba18 100644 --- a/packages/pinball_flame/test/src/behaviors/layer_contact_behavior_test.dart +++ b/packages/pinball_flame/test/src/behaviors/layer_contact_behavior_test.dart @@ -56,5 +56,23 @@ void main() { expect(component.layer, newLayer); }); + + flameTester.test('endContact changes layer', (game) async { + const oldLayer = Layer.all; + const newLayer = Layer.board; + final behavior = LayerContactBehavior( + layer: newLayer, + onBegin: false, + ); + final parent = _TestBodyComponent(); + await game.ensureAdd(parent); + await parent.ensureAdd(behavior); + + final component = _TestLayeredBodyComponent(layer: oldLayer); + + behavior.endContact(component, _MockContact()); + + expect(component.layer, newLayer); + }); }); } diff --git a/packages/pinball_flame/test/src/behaviors/z_index_contact_behavior_test.dart b/packages/pinball_flame/test/src/behaviors/z_index_contact_behavior_test.dart index ad09004c..292a51fc 100644 --- a/packages/pinball_flame/test/src/behaviors/z_index_contact_behavior_test.dart +++ b/packages/pinball_flame/test/src/behaviors/z_index_contact_behavior_test.dart @@ -56,5 +56,20 @@ void main() { expect(component.zIndex, newIndex); }); + + flameTester.test('endContact changes zIndex', (game) async { + const oldIndex = 0; + const newIndex = 1; + final behavior = ZIndexContactBehavior(zIndex: newIndex, onBegin: false); + final parent = _TestBodyComponent(); + await game.ensureAdd(parent); + await parent.ensureAdd(behavior); + + final component = _TestZIndexBodyComponent(zIndex: oldIndex); + + behavior.endContact(component, _MockContact()); + + expect(component.zIndex, newIndex); + }); }); } diff --git a/packages/pinball_flame/test/src/keyboard_input_controller_test.dart b/packages/pinball_flame/test/src/keyboard_input_controller_test.dart index 7b554e8c..f3c783ad 100644 --- a/packages/pinball_flame/test/src/keyboard_input_controller_test.dart +++ b/packages/pinball_flame/test/src/keyboard_input_controller_test.dart @@ -1,11 +1,36 @@ // ignore_for_file: cascade_invocations, one_member_abstracts +import 'package:flame/game.dart'; +import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball_flame/pinball_flame.dart'; +class _TestGame extends FlameGame { + bool pressed = false; + + @override + Future? onLoad() async { + await super.onLoad(); + + await add( + KeyboardInputController( + keyUp: { + LogicalKeyboardKey.enter: () { + pressed = true; + return true; + }, + LogicalKeyboardKey.escape: () { + return false; + }, + }, + ), + ); + } +} + abstract class _KeyCall { bool onCall(); } @@ -75,4 +100,15 @@ void main() { }, ); }); + group('VirtualKeyEvents', () { + final flameTester = FlameTester(_TestGame.new); + + group('onVirtualKeyUp', () { + flameTester.test('triggers the event', (game) async { + await game.ready(); + game.triggerVirtualKeyUp(LogicalKeyboardKey.enter); + expect(game.pressed, isTrue); + }); + }); + }); } diff --git a/packages/pinball_ui/assets/images/button/dpad_down.png b/packages/pinball_ui/assets/images/button/dpad_down.png new file mode 100644 index 00000000..11bbb26f Binary files /dev/null and b/packages/pinball_ui/assets/images/button/dpad_down.png differ diff --git a/packages/pinball_ui/assets/images/button/dpad_left.png b/packages/pinball_ui/assets/images/button/dpad_left.png new file mode 100644 index 00000000..943cacc4 Binary files /dev/null and b/packages/pinball_ui/assets/images/button/dpad_left.png differ diff --git a/packages/pinball_ui/assets/images/button/dpad_right.png b/packages/pinball_ui/assets/images/button/dpad_right.png new file mode 100644 index 00000000..724b9f3e Binary files /dev/null and b/packages/pinball_ui/assets/images/button/dpad_right.png differ diff --git a/packages/pinball_ui/assets/images/button/dpad_up.png b/packages/pinball_ui/assets/images/button/dpad_up.png new file mode 100644 index 00000000..d1175d57 Binary files /dev/null and b/packages/pinball_ui/assets/images/button/dpad_up.png differ diff --git a/packages/pinball_ui/lib/gen/assets.gen.dart b/packages/pinball_ui/lib/gen/assets.gen.dart index 8972e8e0..9b09b254 100644 --- a/packages/pinball_ui/lib/gen/assets.gen.dart +++ b/packages/pinball_ui/lib/gen/assets.gen.dart @@ -3,8 +3,6 @@ /// FlutterGen /// ***************************************************** -// ignore_for_file: directives_ordering,unnecessary_import - import 'package:flutter/widgets.dart'; class $AssetsImagesGen { @@ -17,7 +15,14 @@ class $AssetsImagesGen { class $AssetsImagesButtonGen { const $AssetsImagesButtonGen(); - /// File path: assets/images/button/pinball_button.png + AssetGenImage get dpadDown => + const AssetGenImage('assets/images/button/dpad_down.png'); + AssetGenImage get dpadLeft => + const AssetGenImage('assets/images/button/dpad_left.png'); + AssetGenImage get dpadRight => + const AssetGenImage('assets/images/button/dpad_right.png'); + AssetGenImage get dpadUp => + const AssetGenImage('assets/images/button/dpad_up.png'); AssetGenImage get pinballButton => const AssetGenImage('assets/images/button/pinball_button.png'); } @@ -25,7 +30,6 @@ class $AssetsImagesButtonGen { class $AssetsImagesDialogGen { const $AssetsImagesDialogGen(); - /// File path: assets/images/dialog/background.png AssetGenImage get background => const AssetGenImage('assets/images/dialog/background.png'); } diff --git a/packages/pinball_ui/lib/gen/fonts.gen.dart b/packages/pinball_ui/lib/gen/fonts.gen.dart index 5f77da16..b15f2dd0 100644 --- a/packages/pinball_ui/lib/gen/fonts.gen.dart +++ b/packages/pinball_ui/lib/gen/fonts.gen.dart @@ -3,14 +3,9 @@ /// FlutterGen /// ***************************************************** -// ignore_for_file: directives_ordering,unnecessary_import - class FontFamily { FontFamily._(); - /// Font family: PixeloidMono static const String pixeloidMono = 'PixeloidMono'; - - /// Font family: PixeloidSans static const String pixeloidSans = 'PixeloidSans'; } diff --git a/packages/pinball_ui/lib/src/widgets/pinball_dpad_button.dart b/packages/pinball_ui/lib/src/widgets/pinball_dpad_button.dart new file mode 100644 index 00000000..6d929f53 --- /dev/null +++ b/packages/pinball_ui/lib/src/widgets/pinball_dpad_button.dart @@ -0,0 +1,66 @@ +import 'package:flutter/material.dart'; +import 'package:pinball_ui/gen/gen.dart'; +import 'package:pinball_ui/pinball_ui.dart'; + +/// Enum with all possibile directions of a [PinballDpadButton]. +enum PinballDpadDirection { + /// Up + up, + + /// Down + down, + + /// Left + left, + + /// Right + right, +} + +extension _PinballDpadDirectionX on PinballDpadDirection { + String toAsset() { + switch (this) { + case PinballDpadDirection.up: + return Assets.images.button.dpadUp.keyName; + case PinballDpadDirection.down: + return Assets.images.button.dpadDown.keyName; + case PinballDpadDirection.left: + return Assets.images.button.dpadLeft.keyName; + case PinballDpadDirection.right: + return Assets.images.button.dpadRight.keyName; + } + } +} + +/// {@template pinball_dpad_button} +/// Widget that renders a Dpad button with a given direction. +/// {@endtemplate} +class PinballDpadButton extends StatelessWidget { + /// {@macro pinball_dpad_button} + const PinballDpadButton({ + Key? key, + required this.direction, + required this.onTap, + }) : super(key: key); + + /// Which [PinballDpadDirection] this button is. + final PinballDpadDirection direction; + + /// The function executed when the button is pressed. + final VoidCallback onTap; + + @override + Widget build(BuildContext context) { + return Material( + color: PinballColors.transparent, + child: InkWell( + onTap: onTap, + child: Image.asset( + direction.toAsset(), + width: 60, + height: 60, + ), + ), + ); + } +} diff --git a/packages/pinball_ui/lib/src/widgets/widgets.dart b/packages/pinball_ui/lib/src/widgets/widgets.dart index 3aa96c3e..45a6daad 100644 --- a/packages/pinball_ui/lib/src/widgets/widgets.dart +++ b/packages/pinball_ui/lib/src/widgets/widgets.dart @@ -1,4 +1,5 @@ export 'animated_ellipsis_text.dart'; export 'crt_background.dart'; export 'pinball_button.dart'; +export 'pinball_dpad_button.dart'; export 'pinball_loading_indicator.dart'; diff --git a/packages/pinball_ui/test/src/widgets/pinball_dpad_button_test.dart b/packages/pinball_ui/test/src/widgets/pinball_dpad_button_test.dart new file mode 100644 index 00000000..a7e89534 --- /dev/null +++ b/packages/pinball_ui/test/src/widgets/pinball_dpad_button_test.dart @@ -0,0 +1,122 @@ +// ignore_for_file: one_member_abstracts + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:pinball_ui/gen/gen.dart'; +import 'package:pinball_ui/pinball_ui.dart'; + +extension _WidgetTesterX on WidgetTester { + Future pumpButton({ + required PinballDpadDirection direction, + required VoidCallback onTap, + }) async { + await pumpWidget( + MaterialApp( + home: Scaffold( + body: PinballDpadButton( + direction: direction, + onTap: onTap, + ), + ), + ), + ); + } +} + +extension _CommonFindersX on CommonFinders { + Finder byImagePath(String path) { + return find.byWidgetPredicate( + (widget) { + if (widget is Image) { + final image = widget.image; + + if (image is AssetImage) { + return image.keyName == path; + } + return false; + } + + return false; + }, + ); + } +} + +abstract class _VoidCallbackStubBase { + void onCall(); +} + +class _VoidCallbackStub extends Mock implements _VoidCallbackStubBase {} + +void main() { + group('PinballDpadButton', () { + testWidgets('can be tapped', (tester) async { + final stub = _VoidCallbackStub(); + await tester.pumpButton( + direction: PinballDpadDirection.up, + onTap: stub.onCall, + ); + + await tester.tap(find.byType(Image)); + + verify(stub.onCall).called(1); + }); + + group('up', () { + testWidgets('renders the correct image', (tester) async { + await tester.pumpButton( + direction: PinballDpadDirection.up, + onTap: () {}, + ); + + expect( + find.byImagePath(Assets.images.button.dpadUp.keyName), + findsOneWidget, + ); + }); + }); + + group('down', () { + testWidgets('renders the correct image', (tester) async { + await tester.pumpButton( + direction: PinballDpadDirection.down, + onTap: () {}, + ); + + expect( + find.byImagePath(Assets.images.button.dpadDown.keyName), + findsOneWidget, + ); + }); + }); + + group('left', () { + testWidgets('renders the correct image', (tester) async { + await tester.pumpButton( + direction: PinballDpadDirection.left, + onTap: () {}, + ); + + expect( + find.byImagePath(Assets.images.button.dpadLeft.keyName), + findsOneWidget, + ); + }); + }); + + group('right', () { + testWidgets('renders the correct image', (tester) async { + await tester.pumpButton( + direction: PinballDpadDirection.right, + onTap: () {}, + ); + + expect( + find.byImagePath(Assets.images.button.dpadRight.keyName), + findsOneWidget, + ); + }); + }); + }); +} diff --git a/test/game/behaviors/bonus_ball_spawning_behavior_test.dart b/test/game/behaviors/bonus_ball_spawning_behavior_test.dart new file mode 100644 index 00000000..1aacf506 --- /dev/null +++ b/test/game/behaviors/bonus_ball_spawning_behavior_test.dart @@ -0,0 +1,61 @@ +// ignore_for_file: cascade_invocations + +import 'package:flame_bloc/flame_bloc.dart'; +import 'package:flame_forge2d/forge2d_game.dart'; +import 'package:flame_test/flame_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pinball/game/behaviors/behaviors.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:pinball_theme/pinball_theme.dart' as theme; + +class _TestGame extends Forge2DGame { + @override + Future onLoad() async { + images.prefix = ''; + await images.loadAll([ + theme.Assets.images.dash.ball.keyName, + ]); + } + + Future pump(BonusBallSpawningBehavior child) async { + await ensureAdd( + FlameBlocProvider.value( + value: CharacterThemeCubit(), + children: [ + ZCanvasComponent( + children: [child], + ), + ], + ), + ); + } +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('FlutterForestBonusBehavior', () { + final flameTester = FlameTester(_TestGame.new); + + flameTester.test( + 'adds a ball with a BallImpulsingBehavior to the game onTick ' + 'resulting in a -40 x impulse', + (game) async { + await game.onLoad(); + final behavior = BonusBallSpawningBehavior(); + + await game.pump(behavior); + + game.update(behavior.timer.limit); + await game.ready(); + + final ball = game.descendants().whereType().single; + + expect(ball.body.linearVelocity.x, equals(-40)); + expect(ball.body.linearVelocity.y, equals(0)); + }, + ); + }); +} diff --git a/test/game/behaviors/bonus_noise_behavior_test.dart b/test/game/behaviors/bonus_noise_behavior_test.dart index 12f62545..fada7d1e 100644 --- a/test/game/behaviors/bonus_noise_behavior_test.dart +++ b/test/game/behaviors/bonus_noise_behavior_test.dart @@ -126,7 +126,7 @@ void main() { await game.pump(behavior, player: player, bloc: bloc); }, verify: (_, __) async { - verifyNever(() => player.play(any())); + verify(() => player.play(PinballAudio.dino)).called(1); }, ); @@ -151,7 +151,7 @@ void main() { await game.pump(behavior, player: player, bloc: bloc); }, verify: (_, __) async { - verifyNever(() => player.play(any())); + verify(() => player.play(PinballAudio.android)).called(1); }, ); @@ -176,7 +176,7 @@ void main() { await game.pump(behavior, player: player, bloc: bloc); }, verify: (_, __) async { - verifyNever(() => player.play(any())); + verify(() => player.play(PinballAudio.dash)).called(1); }, ); }); diff --git a/test/game/components/backbox/backbox_test.dart b/test/game/components/backbox/backbox_test.dart index d61bd83a..24cb4fb2 100644 --- a/test/game/components/backbox/backbox_test.dart +++ b/test/game/components/backbox/backbox_test.dart @@ -19,6 +19,7 @@ import 'package:pinball/l10n/l10n.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 with HasKeyboardHandlerComponents { final character = theme.DashTheme(); @@ -64,6 +65,8 @@ RawKeyUpEvent _mockKeyUp(LogicalKeyboardKey key) { return event; } +class _MockPlatformHelper extends Mock implements PlatformHelper {} + class _MockBackboxBloc extends Mock implements BackboxBloc {} class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { @@ -104,36 +107,32 @@ void main() { final flameTester = FlameTester(_TestGame.new); late BackboxBloc bloc; + late PlatformHelper platformHelper; setUp(() { bloc = _MockBackboxBloc(); + platformHelper = _MockPlatformHelper(); whenListen( bloc, Stream.empty(), initialState: LoadingState(), ); + when(() => platformHelper.isMobile).thenReturn(false); }); group('Backbox', () { flameTester.test( 'loads correctly', (game) async { - final backbox = Backbox.test(bloc: bloc); + final backbox = Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ); await game.pump(backbox); expect(game.descendants(), contains(backbox)); }, ); - flameTester.test( - 'adds LeaderboardRequested when loaded', - (game) async { - final backbox = Backbox.test(bloc: bloc); - await game.pump(backbox); - - verify(() => bloc.add(LeaderboardRequested())).called(1); - }, - ); - flameTester.testGameWidget( 'renders correctly', setUp: (game, tester) async { @@ -142,7 +141,10 @@ void main() { ..followVector2(Vector2(0, -130)) ..zoom = 6; await game.pump( - Backbox.test(bloc: bloc), + Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ), ); await tester.pump(); }, @@ -160,7 +162,9 @@ void main() { final backbox = Backbox.test( bloc: BackboxBloc( leaderboardRepository: _MockLeaderboardRepository(), + initialEntries: [LeaderboardEntryData.empty], ), + platformHelper: platformHelper, ); await game.pump(backbox); backbox.requestInitials( @@ -189,7 +193,10 @@ void main() { Stream.empty(), initialState: state, ); - final backbox = Backbox.test(bloc: bloc); + final backbox = Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ); await game.pump(backbox); game.onKeyEvent(_mockKeyUp(LogicalKeyboardKey.enter), {}); @@ -205,6 +212,34 @@ void main() { }, ); + flameTester.test( + 'adds the mobile controls overlay when platform is mobile', + (game) async { + final bloc = _MockBackboxBloc(); + final platformHelper = _MockPlatformHelper(); + final state = InitialsFormState( + score: 10, + character: game.character, + ); + whenListen( + bloc, + Stream.empty(), + initialState: state, + ); + when(() => platformHelper.isMobile).thenReturn(true); + final backbox = Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ); + await game.pump(backbox); + + expect( + game.overlays.value, + contains(PinballGame.mobileControlsOverlay), + ); + }, + ); + flameTester.test( 'adds InitialsSubmissionSuccessDisplay on InitialsSuccessState', (game) async { @@ -213,7 +248,10 @@ void main() { Stream.empty(), initialState: InitialsSuccessState(), ); - final backbox = Backbox.test(bloc: bloc); + final backbox = Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ); await game.pump(backbox); expect( @@ -234,7 +272,10 @@ void main() { Stream.empty(), initialState: InitialsFailureState(), ); - final backbox = Backbox.test(bloc: bloc); + final backbox = Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ); await game.pump(backbox); expect( @@ -256,7 +297,10 @@ void main() { initialState: LeaderboardSuccessState(entries: const []), ); - final backbox = Backbox.test(bloc: bloc); + final backbox = Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ); await game.pump(backbox); expect( @@ -276,7 +320,10 @@ void main() { initialState: LoadingState(), ); - final backbox = Backbox.test(bloc: bloc); + final backbox = Backbox.test( + bloc: bloc, + platformHelper: platformHelper, + ); await game.pump(backbox); backbox.removeFromParent(); diff --git a/test/game/components/backbox/bloc/backbox_bloc_test.dart b/test/game/components/backbox/bloc/backbox_bloc_test.dart index 3958adb5..0f265875 100644 --- a/test/game/components/backbox/bloc/backbox_bloc_test.dart +++ b/test/game/components/backbox/bloc/backbox_bloc_test.dart @@ -12,14 +12,37 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { void main() { late LeaderboardRepository leaderboardRepository; + const emptyEntries = []; + const filledEntries = [LeaderboardEntryData.empty]; group('BackboxBloc', () { + test('inits state with LeaderboardSuccessState when has entries', () { + leaderboardRepository = _MockLeaderboardRepository(); + final bloc = BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: filledEntries, + ); + expect(bloc.state, isA()); + }); + + test('inits state with LeaderboardFailureState when has no entries', () { + leaderboardRepository = _MockLeaderboardRepository(); + final bloc = BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: null, + ); + expect(bloc.state, isA()); + }); + blocTest( 'adds InitialsFormState on PlayerInitialsRequested', setUp: () { leaderboardRepository = _MockLeaderboardRepository(); }, - build: () => BackboxBloc(leaderboardRepository: leaderboardRepository), + build: () => BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: emptyEntries, + ), act: (bloc) => bloc.add( PlayerInitialsRequested( score: 100, @@ -46,7 +69,10 @@ void main() { ), ).thenAnswer((_) async {}); }, - build: () => BackboxBloc(leaderboardRepository: leaderboardRepository), + build: () => BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: emptyEntries, + ), act: (bloc) => bloc.add( PlayerInitialsSubmitted( score: 10, @@ -74,7 +100,10 @@ void main() { ), ).thenThrow(Exception('Error')); }, - build: () => BackboxBloc(leaderboardRepository: leaderboardRepository), + build: () => BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: emptyEntries, + ), act: (bloc) => bloc.add( PlayerInitialsSubmitted( score: 10, @@ -100,7 +129,10 @@ void main() { (_) async => [LeaderboardEntryData.empty], ); }, - build: () => BackboxBloc(leaderboardRepository: leaderboardRepository), + build: () => BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: emptyEntries, + ), act: (bloc) => bloc.add(LeaderboardRequested()), expect: () => [ LoadingState(), @@ -116,7 +148,10 @@ void main() { () => leaderboardRepository.fetchTop10Leaderboard(), ).thenThrow(Exception('Error')); }, - build: () => BackboxBloc(leaderboardRepository: leaderboardRepository), + build: () => BackboxBloc( + leaderboardRepository: leaderboardRepository, + initialEntries: emptyEntries, + ), act: (bloc) => bloc.add(LeaderboardRequested()), expect: () => [ LoadingState(), diff --git a/test/game/components/controlled_flipper_test.dart b/test/game/components/controlled_flipper_test.dart deleted file mode 100644 index 00a69f9e..00000000 --- a/test/game/components/controlled_flipper_test.dart +++ /dev/null @@ -1,260 +0,0 @@ -import 'dart:collection'; - -import 'package:bloc_test/bloc_test.dart'; -import 'package:flame/input.dart'; -import 'package:flame_bloc/flame_bloc.dart'; -import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flame_test/flame_test.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:mocktail/mocktail.dart'; -import 'package:pinball/game/game.dart'; -import 'package:pinball_components/pinball_components.dart'; - -import '../../helpers/helpers.dart'; - -class _TestGame extends Forge2DGame with HasKeyboardHandlerComponents { - @override - Future onLoad() async { - images.prefix = ''; - await images.loadAll([ - Assets.images.flipper.left.keyName, - Assets.images.flipper.right.keyName, - ]); - } - - Future pump(Flipper flipper, {required GameBloc gameBloc}) { - return ensureAdd( - FlameBlocProvider.value( - value: gameBloc, - children: [flipper], - ), - ); - } -} - -class _MockGameBloc extends Mock implements GameBloc {} - -void main() { - TestWidgetsFlutterBinding.ensureInitialized(); - final flameTester = FlameTester(_TestGame.new); - - group('FlipperController', () { - late GameBloc gameBloc; - - setUp(() { - gameBloc = _MockGameBloc(); - }); - - group('onKeyEvent', () { - final leftKeys = UnmodifiableListView([ - LogicalKeyboardKey.arrowLeft, - LogicalKeyboardKey.keyA, - ]); - final rightKeys = UnmodifiableListView([ - LogicalKeyboardKey.arrowRight, - LogicalKeyboardKey.keyD, - ]); - - group('and Flipper is left', () { - late Flipper flipper; - late FlipperController controller; - - setUp(() { - flipper = Flipper(side: BoardSide.left); - controller = FlipperController(flipper); - flipper.add(controller); - }); - - testRawKeyDownEvents(leftKeys, (event) { - flameTester.test( - 'moves upwards ' - 'when ${event.logicalKey.keyLabel} is pressed', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial().copyWith( - status: GameStatus.playing, - ), - ); - - await game.ready(); - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isNegative); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - - testRawKeyDownEvents(leftKeys, (event) { - flameTester.test( - 'does nothing when is game over', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial().copyWith( - status: GameStatus.gameOver, - ), - ); - - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isZero); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - - testRawKeyUpEvents(leftKeys, (event) { - flameTester.test( - 'moves downwards ' - 'when ${event.logicalKey.keyLabel} is released', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial().copyWith( - status: GameStatus.playing, - ), - ); - - await game.ready(); - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isPositive); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - - testRawKeyUpEvents(rightKeys, (event) { - flameTester.test( - 'does nothing ' - 'when ${event.logicalKey.keyLabel} is released', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial(), - ); - - await game.ready(); - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isZero); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - }); - - group('and Flipper is right', () { - late Flipper flipper; - late FlipperController controller; - - setUp(() { - flipper = Flipper(side: BoardSide.right); - controller = FlipperController(flipper); - flipper.add(controller); - }); - - testRawKeyDownEvents(rightKeys, (event) { - flameTester.test( - 'moves upwards ' - 'when ${event.logicalKey.keyLabel} is pressed', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial().copyWith( - status: GameStatus.playing, - ), - ); - - await game.ready(); - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isNegative); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - - testRawKeyUpEvents(rightKeys, (event) { - flameTester.test( - 'moves downwards ' - 'when ${event.logicalKey.keyLabel} is released', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial().copyWith( - status: GameStatus.playing, - ), - ); - - await game.ready(); - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isPositive); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - - testRawKeyDownEvents(rightKeys, (event) { - flameTester.test( - 'does nothing when is game over', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial().copyWith( - status: GameStatus.gameOver, - ), - ); - - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isZero); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - - testRawKeyUpEvents(leftKeys, (event) { - flameTester.test( - 'does nothing ' - 'when ${event.logicalKey.keyLabel} is released', - (game) async { - whenListen( - gameBloc, - const Stream.empty(), - initialState: const GameState.initial().copyWith( - status: GameStatus.playing, - ), - ); - - await game.ready(); - await game.pump(flipper, gameBloc: gameBloc); - controller.onKeyEvent(event, {}); - - expect(flipper.body.linearVelocity.y, isZero); - expect(flipper.body.linearVelocity.x, isZero); - }, - ); - }); - }); - }); - }); -} diff --git a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart index 0d058c70..0b75a61e 100644 --- a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart +++ b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart @@ -5,9 +5,9 @@ import 'package:flame_forge2d/forge2d_game.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; +import 'package:pinball/game/behaviors/behaviors.dart'; import 'package:pinball/game/components/flutter_forest/behaviors/behaviors.dart'; import 'package:pinball/game/game.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:pinball_theme/pinball_theme.dart' as theme; @@ -27,13 +27,8 @@ class _TestGame extends Forge2DGame { required GameBloc gameBloc, }) async { await ensureAdd( - FlameMultiBlocProvider( - providers: [ - FlameBlocProvider.value(value: gameBloc), - FlameBlocProvider.value( - value: CharacterThemeCubit(), - ), - ], + FlameBlocProvider.value( + value: gameBloc, children: [ ZCanvasComponent( children: [child], @@ -94,7 +89,7 @@ void main() { ); flameTester.testGameWidget( - 'adds a new Ball to the game ' + 'adds BonusBallSpawningBehavior to the game ' 'when bumpers are activated three times', setUp: (game, tester) async { await game.onLoad(); @@ -121,7 +116,7 @@ void main() { await game.ready(); expect( - game.descendants().whereType().length, + game.descendants().whereType().length, equals(1), ); }, diff --git a/test/game/components/game_bloc_status_listener_test.dart b/test/game/components/game_bloc_status_listener_test.dart index 767ddefa..e8685c3e 100644 --- a/test/game/components/game_bloc_status_listener_test.dart +++ b/test/game/components/game_bloc_status_listener_test.dart @@ -8,16 +8,24 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:leaderboard_repository/leaderboard_repository.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball/game/game.dart'; +import 'package:pinball/l10n/l10n.dart'; 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:pinball_theme/pinball_theme.dart' as theme; class _TestGame extends Forge2DGame { @override Future onLoad() async { images.prefix = ''; - await images.load(Assets.images.backbox.marquee.keyName); + await images.loadAll( + [ + const theme.DashTheme().leaderboardIcon.keyName, + Assets.images.backbox.marquee.keyName, + Assets.images.backbox.displayDivider.keyName, + ], + ); } Future pump( @@ -35,8 +43,15 @@ class _TestGame extends Forge2DGame { ), ], children: [ - FlameProvider.value( - pinballPlayer ?? _MockPinballPlayer(), + MultiFlameProvider( + providers: [ + FlameProvider.value( + pinballPlayer ?? _MockPinballPlayer(), + ), + FlameProvider.value( + _MockAppLocalizations(), + ), + ], children: children, ), ], @@ -50,6 +65,35 @@ class _MockPinballPlayer extends Mock implements PinballPlayer {} class _MockLeaderboardRepository extends Mock implements LeaderboardRepository { } +class _MockAppLocalizations extends Mock implements AppLocalizations { + @override + String get score => ''; + + @override + String get name => ''; + + @override + String get rank => ''; + + @override + String get enterInitials => ''; + + @override + String get arrows => ''; + + @override + String get andPress => ''; + + @override + String get enterReturn => ''; + + @override + String get toSubmit => ''; + + @override + String get loading => ''; +} + void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -92,54 +136,125 @@ void main() { }); group('onNewState', () { - flameTester.test( - 'changes the backbox display when the game is over', - (game) async { - final component = GameBlocStatusListener(); - final repository = _MockLeaderboardRepository(); - final backbox = Backbox(leaderboardRepository: repository); - final state = const GameState.initial() - ..copyWith( - status: GameStatus.gameOver, + group('on game over', () { + late GameState state; + + setUp(() { + state = const GameState.initial().copyWith( + status: GameStatus.gameOver, + ); + }); + + flameTester.test( + 'changes the backbox display', + (game) async { + final component = GameBlocStatusListener(); + final repository = _MockLeaderboardRepository(); + final backbox = Backbox( + leaderboardRepository: repository, + entries: const [], ); - await game.pump([component, backbox]); + await game.pump([component, backbox]); - expect(() => component.onNewState(state), returnsNormally); - }, - ); + expect(() => component.onNewState(state), returnsNormally); + }, + ); - flameTester.test( - 'plays the background music on start', - (game) async { - final player = _MockPinballPlayer(); - final component = GameBlocStatusListener(); - await game.pump([component], pinballPlayer: player); + flameTester.test( + 'removes FlipperKeyControllingBehavior from Fipper', + (game) async { + final component = GameBlocStatusListener(); + final repository = _MockLeaderboardRepository(); + final backbox = Backbox( + leaderboardRepository: repository, + entries: const [], + ); + final flipper = Flipper.test(side: BoardSide.left); + final behavior = FlipperKeyControllingBehavior(); - component.onNewState( - const GameState.initial().copyWith(status: GameStatus.playing), - ); + await game.pump([component, backbox, flipper]); + await flipper.ensureAdd(behavior); - verify(() => player.play(PinballAudio.backgroundMusic)).called(1); - }, - ); + expect(state.status, GameStatus.gameOver); + + component.onNewState(state); + await game.ready(); + + expect( + flipper.children.whereType(), + isEmpty, + ); + }, + ); + + flameTester.test( + 'plays the game over voice over', + (game) async { + final player = _MockPinballPlayer(); + final component = GameBlocStatusListener(); + final repository = _MockLeaderboardRepository(); + final backbox = Backbox( + leaderboardRepository: repository, + entries: const [], + ); + await game.pump([component, backbox], pinballPlayer: player); + + component.onNewState(state); + + verify(() => player.play(PinballAudio.gameOverVoiceOver)).called(1); + }, + ); + }); + + group('on playing', () { + late GameState state; - flameTester.test( - 'plays the game over voice over when it is game over', - (game) async { - final player = _MockPinballPlayer(); - final component = GameBlocStatusListener(); - final repository = _MockLeaderboardRepository(); - final backbox = Backbox(leaderboardRepository: repository); - await game.pump([component, backbox], pinballPlayer: player); - - component.onNewState( - const GameState.initial().copyWith(status: GameStatus.gameOver), + setUp(() { + state = const GameState.initial().copyWith( + status: GameStatus.playing, ); + }); - verify(() => player.play(PinballAudio.gameOverVoiceOver)).called(1); - }, - ); + flameTester.test( + 'plays the background music on start', + (game) async { + final player = _MockPinballPlayer(); + final component = GameBlocStatusListener(); + await game.pump([component], pinballPlayer: player); + + expect(state.status, equals(GameStatus.playing)); + component.onNewState(state); + + verify(() => player.play(PinballAudio.backgroundMusic)).called(1); + }, + ); + + flameTester.test( + 'adds key controlling behavior to Fippers when the game is started', + (game) async { + final component = GameBlocStatusListener(); + final repository = _MockLeaderboardRepository(); + final backbox = Backbox( + leaderboardRepository: repository, + entries: const [], + ); + final flipper = Flipper.test(side: BoardSide.left); + + await game.pump([component, backbox, flipper]); + + component.onNewState(state); + await game.ready(); + + expect( + flipper.children + .whereType() + .length, + equals(1), + ); + }, + ); + }); }); }); } diff --git a/test/game/view/pinball_game_page_test.dart b/test/game/view/pinball_game_page_test.dart index 0e23e54d..fbcf8c76 100644 --- a/test/game/view/pinball_game_page_test.dart +++ b/test/game/view/pinball_game_page_test.dart @@ -32,7 +32,10 @@ class _TestPinballGame extends PinballGame { @override Future onLoad() async { images.prefix = ''; - final futures = preLoadAssets(); + final futures = [ + ...preLoadAssets(), + preFetchLeaderboard(), + ]; await Future.wait(futures); return super.onLoad(); @@ -335,6 +338,20 @@ void main() { expect(game.focusNode.hasFocus, isTrue); }); + testWidgets('mobile controls when the overlay is added', (tester) async { + await tester.pumpApp( + PinballGameView(game: game), + gameBloc: gameBloc, + startGameBloc: startGameBloc, + ); + + game.overlays.add(PinballGame.mobileControlsOverlay); + + await tester.pump(); + + expect(find.byType(MobileControls), findsOneWidget); + }); + group('info icon', () { testWidgets('renders on game over', (tester) async { final gameState = GameState.initial().copyWith( diff --git a/test/game/view/widgets/mobile_controls_test.dart b/test/game/view/widgets/mobile_controls_test.dart new file mode 100644 index 00000000..ab9c0b76 --- /dev/null +++ b/test/game/view/widgets/mobile_controls_test.dart @@ -0,0 +1,131 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:pinball/game/game.dart'; +import 'package:pinball/l10n/l10n.dart'; +import 'package:pinball_flame/pinball_flame.dart'; +import 'package:pinball_ui/pinball_ui.dart'; + +class _MockPinballGame extends Mock implements PinballGame {} + +extension _WidgetTesterX on WidgetTester { + Future pumpMobileControls(PinballGame game) async { + await pumpWidget( + MaterialApp( + localizationsDelegates: const [ + AppLocalizations.delegate, + GlobalMaterialLocalizations.delegate, + ], + home: Scaffold( + body: MobileControls(game: game), + ), + ), + ); + } +} + +extension _CommonFindersX on CommonFinders { + Finder byPinballDpadDirection(PinballDpadDirection direction) { + return byWidgetPredicate((widget) { + return widget is PinballDpadButton && widget.direction == direction; + }); + } +} + +void main() { + group('MobileControls', () { + testWidgets('renders', (tester) async { + await tester.pumpMobileControls(_MockPinballGame()); + + expect(find.byType(PinballButton), findsOneWidget); + expect(find.byType(MobileDpad), findsOneWidget); + }); + + testWidgets('correctly triggers the arrow up', (tester) async { + var pressed = false; + final component = KeyboardInputController( + keyUp: { + LogicalKeyboardKey.arrowUp: () => pressed = true, + }, + ); + final game = _MockPinballGame(); + when(game.descendants).thenReturn([component]); + + await tester.pumpMobileControls(game); + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.up)); + await tester.pump(); + + expect(pressed, isTrue); + }); + + testWidgets('correctly triggers the arrow down', (tester) async { + var pressed = false; + final component = KeyboardInputController( + keyUp: { + LogicalKeyboardKey.arrowDown: () => pressed = true, + }, + ); + final game = _MockPinballGame(); + when(game.descendants).thenReturn([component]); + + await tester.pumpMobileControls(game); + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.down)); + await tester.pump(); + + expect(pressed, isTrue); + }); + + testWidgets('correctly triggers the arrow right', (tester) async { + var pressed = false; + final component = KeyboardInputController( + keyUp: { + LogicalKeyboardKey.arrowRight: () => pressed = true, + }, + ); + final game = _MockPinballGame(); + when(game.descendants).thenReturn([component]); + + await tester.pumpMobileControls(game); + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.right)); + await tester.pump(); + + expect(pressed, isTrue); + }); + + testWidgets('correctly triggers the arrow left', (tester) async { + var pressed = false; + final component = KeyboardInputController( + keyUp: { + LogicalKeyboardKey.arrowLeft: () => pressed = true, + }, + ); + final game = _MockPinballGame(); + when(game.descendants).thenReturn([component]); + + await tester.pumpMobileControls(game); + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.left)); + await tester.pump(); + + expect(pressed, isTrue); + }); + + testWidgets('correctly triggers the enter', (tester) async { + var pressed = false; + final component = KeyboardInputController( + keyUp: { + LogicalKeyboardKey.enter: () => pressed = true, + }, + ); + final game = _MockPinballGame(); + when(game.descendants).thenReturn([component]); + + await tester.pumpMobileControls(game); + await tester.tap(find.byType(PinballButton)); + await tester.pump(); + + expect(pressed, isTrue); + }); + }); +} diff --git a/test/game/view/widgets/mobile_dpad_test.dart b/test/game/view/widgets/mobile_dpad_test.dart new file mode 100644 index 00000000..2a8d0b02 --- /dev/null +++ b/test/game/view/widgets/mobile_dpad_test.dart @@ -0,0 +1,113 @@ +// ignore_for_file: one_member_abstracts + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:pinball/game/game.dart'; +import 'package:pinball_ui/pinball_ui.dart'; + +extension _WidgetTesterX on WidgetTester { + Future pumpDpad({ + required VoidCallback onTapUp, + required VoidCallback onTapDown, + required VoidCallback onTapLeft, + required VoidCallback onTapRight, + }) async { + await pumpWidget( + MaterialApp( + home: Scaffold( + body: MobileDpad( + onTapUp: onTapUp, + onTapDown: onTapDown, + onTapLeft: onTapLeft, + onTapRight: onTapRight, + ), + ), + ), + ); + } +} + +extension _CommonFindersX on CommonFinders { + Finder byPinballDpadDirection(PinballDpadDirection direction) { + return byWidgetPredicate((widget) { + return widget is PinballDpadButton && widget.direction == direction; + }); + } +} + +abstract class _VoidCallbackStubBase { + void onCall(); +} + +class _VoidCallbackStub extends Mock implements _VoidCallbackStubBase {} + +void main() { + group('MobileDpad', () { + testWidgets('renders correctly', (tester) async { + await tester.pumpDpad( + onTapUp: () {}, + onTapDown: () {}, + onTapLeft: () {}, + onTapRight: () {}, + ); + + expect( + find.byType(PinballDpadButton), + findsNWidgets(4), + ); + }); + + testWidgets('can tap up', (tester) async { + final stub = _VoidCallbackStub(); + await tester.pumpDpad( + onTapUp: stub.onCall, + onTapDown: () {}, + onTapLeft: () {}, + onTapRight: () {}, + ); + + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.up)); + verify(stub.onCall).called(1); + }); + + testWidgets('can tap down', (tester) async { + final stub = _VoidCallbackStub(); + await tester.pumpDpad( + onTapUp: () {}, + onTapDown: stub.onCall, + onTapLeft: () {}, + onTapRight: () {}, + ); + + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.down)); + verify(stub.onCall).called(1); + }); + + testWidgets('can tap left', (tester) async { + final stub = _VoidCallbackStub(); + await tester.pumpDpad( + onTapUp: () {}, + onTapDown: () {}, + onTapLeft: stub.onCall, + onTapRight: () {}, + ); + + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.left)); + verify(stub.onCall).called(1); + }); + + testWidgets('can tap left', (tester) async { + final stub = _VoidCallbackStub(); + await tester.pumpDpad( + onTapUp: () {}, + onTapDown: () {}, + onTapLeft: () {}, + onTapRight: stub.onCall, + ); + + await tester.tap(find.byPinballDpadDirection(PinballDpadDirection.right)); + verify(stub.onCall).called(1); + }); + }); +}