Merge branch 'main' into fix/spaceship-ramp-logic

pull/416/head
RuiAlonso 3 years ago
commit ff925cb035

@ -9,6 +9,7 @@ import 'package:pinball/select_character/select_character.dart';
import 'package:pinball/start_game/start_game.dart'; import 'package:pinball/start_game/start_game.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:pinball_ui/pinball_ui.dart'; import 'package:pinball_ui/pinball_ui.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
class App extends StatelessWidget { class App extends StatelessWidget {
@ -18,16 +19,19 @@ class App extends StatelessWidget {
required LeaderboardRepository leaderboardRepository, required LeaderboardRepository leaderboardRepository,
required ShareRepository shareRepository, required ShareRepository shareRepository,
required PinballAudioPlayer pinballAudioPlayer, required PinballAudioPlayer pinballAudioPlayer,
required PlatformHelper platformHelper,
}) : _authenticationRepository = authenticationRepository, }) : _authenticationRepository = authenticationRepository,
_leaderboardRepository = leaderboardRepository, _leaderboardRepository = leaderboardRepository,
_shareRepository = shareRepository, _shareRepository = shareRepository,
_pinballAudioPlayer = pinballAudioPlayer, _pinballAudioPlayer = pinballAudioPlayer,
_platformHelper = platformHelper,
super(key: key); super(key: key);
final AuthenticationRepository _authenticationRepository; final AuthenticationRepository _authenticationRepository;
final LeaderboardRepository _leaderboardRepository; final LeaderboardRepository _leaderboardRepository;
final ShareRepository _shareRepository; final ShareRepository _shareRepository;
final PinballAudioPlayer _pinballAudioPlayer; final PinballAudioPlayer _pinballAudioPlayer;
final PlatformHelper _platformHelper;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -37,6 +41,7 @@ class App extends StatelessWidget {
RepositoryProvider.value(value: _leaderboardRepository), RepositoryProvider.value(value: _leaderboardRepository),
RepositoryProvider.value(value: _shareRepository), RepositoryProvider.value(value: _shareRepository),
RepositoryProvider.value(value: _pinballAudioPlayer), RepositoryProvider.value(value: _pinballAudioPlayer),
RepositoryProvider.value(value: _platformHelper),
], ],
child: MultiBlocProvider( child: MultiBlocProvider(
providers: [ providers: [

@ -2,6 +2,8 @@ import 'package:flame/components.dart';
import 'package:flame_bloc/flame_bloc.dart'; import 'package:flame_bloc/flame_bloc.dart';
import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart';
import 'package:platform_helper/platform_helper.dart';
/// Updates the [ArcadeBackground] and launch [Ball] to reflect character /// Updates the [ArcadeBackground] and launch [Ball] to reflect character
/// selections. /// selections.
@ -11,12 +13,14 @@ class CharacterSelectionBehavior extends Component
HasGameRef { HasGameRef {
@override @override
void onNewState(CharacterThemeState state) { void onNewState(CharacterThemeState state) {
if (!readProvider<PlatformHelper>().isMobile) {
gameRef gameRef
.descendants() .descendants()
.whereType<ArcadeBackground>() .whereType<ArcadeBackground>()
.single .single
.bloc .bloc
.onCharacterSelected(state.characterTheme); .onCharacterSelected(state.characterTheme);
}
gameRef gameRef
.descendants() .descendants()
.whereType<Ball>() .whereType<Ball>()

@ -27,23 +27,19 @@ class Backbox extends PositionComponent with ZIndex, HasGameRef {
leaderboardRepository: leaderboardRepository, leaderboardRepository: leaderboardRepository,
initialEntries: entries, initialEntries: entries,
), ),
_shareRepository = shareRepository, _shareRepository = shareRepository;
_platformHelper = PlatformHelper();
/// {@macro backbox} /// {@macro backbox}
@visibleForTesting @visibleForTesting
Backbox.test({ Backbox.test({
required BackboxBloc bloc, required BackboxBloc bloc,
required ShareRepository shareRepository, required ShareRepository shareRepository,
required PlatformHelper platformHelper,
}) : _bloc = bloc, }) : _bloc = bloc,
_shareRepository = shareRepository, _shareRepository = shareRepository;
_platformHelper = platformHelper;
final ShareRepository _shareRepository; final ShareRepository _shareRepository;
late final Component _display; late final Component _display;
final BackboxBloc _bloc; final BackboxBloc _bloc;
final PlatformHelper _platformHelper;
late StreamSubscription<BackboxState> _subscription; late StreamSubscription<BackboxState> _subscription;
@override @override
@ -76,7 +72,7 @@ class Backbox extends PositionComponent with ZIndex, HasGameRef {
} else if (state is LeaderboardFailureState) { } else if (state is LeaderboardFailureState) {
_display.add(LeaderboardFailureDisplay()); _display.add(LeaderboardFailureDisplay());
} else if (state is InitialsFormState) { } else if (state is InitialsFormState) {
if (_platformHelper.isMobile) { if (readProvider<PlatformHelper>().isMobile) {
gameRef.overlays.add(PinballGame.mobileControlsOverlay); gameRef.overlays.add(PinballGame.mobileControlsOverlay);
} }
_display.add( _display.add(
@ -109,7 +105,7 @@ class Backbox extends PositionComponent with ZIndex, HasGameRef {
ShareDisplay( ShareDisplay(
onShare: (platform) { onShare: (platform) {
final message = readProvider<AppLocalizations>() final message = readProvider<AppLocalizations>()
.iGotScoreAtPinball(state.score); .iGotScoreAtPinball(state.score.formatScore());
final url = _shareRepository.shareText( final url = _shareRepository.shareText(
value: message, value: message,
platform: platform, platform: platform,

@ -212,7 +212,7 @@ class GoogleIOLinkComponent extends TextComponent with HasGameRef, Tappable {
); );
@override @override
bool onTapDown(TapDownInfo info) { bool onTapUp(TapUpInfo info) {
openLink(ShareRepository.googleIOEvent); openLink(ShareRepository.googleIOEvent);
return true; return true;
} }

@ -140,7 +140,7 @@ class FacebookButtonComponent extends SpriteComponent
final OnSocialShareTap? _onTap; final OnSocialShareTap? _onTap;
@override @override
bool onTapDown(TapDownInfo info) { bool onTapUp(TapUpInfo info) {
_onTap?.call(SharePlatform.facebook); _onTap?.call(SharePlatform.facebook);
return true; return true;
} }
@ -172,7 +172,7 @@ class TwitterButtonComponent extends SpriteComponent with HasGameRef, Tappable {
final OnSocialShareTap? _onTap; final OnSocialShareTap? _onTap;
@override @override
bool onTapDown(TapDownInfo info) { bool onTapUp(TapUpInfo info) {
_onTap?.call(SharePlatform.twitter); _onTap?.call(SharePlatform.twitter);
return true; return true;
} }

@ -1,5 +1,6 @@
import 'package:flame/components.dart'; import 'package:flame/components.dart';
import 'package:flame_bloc/flame_bloc.dart'; import 'package:flame_bloc/flame_bloc.dart';
import 'package:pinball/game/behaviors/behaviors.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_flame/pinball_flame.dart';
@ -17,6 +18,7 @@ class GoogleWordBonusBehavior extends Component {
readBloc<GameBloc, GameState>() readBloc<GameBloc, GameState>()
.add(const BonusActivated(GameBonus.googleWord)); .add(const BonusActivated(GameBonus.googleWord));
readBloc<GoogleWordCubit, GoogleWordState>().onBonusAwarded(); readBloc<GoogleWordCubit, GoogleWordState>().onBonusAwarded();
add(BonusBallSpawningBehavior());
}, },
), ),
); );

@ -11,7 +11,8 @@ class MultiballsBehavior extends Component
bool listenWhen(GameState? previousState, GameState newState) { bool listenWhen(GameState? previousState, GameState newState) {
final hasChanged = previousState?.bonusHistory != newState.bonusHistory; final hasChanged = previousState?.bonusHistory != newState.bonusHistory;
final lastBonusIsMultiball = newState.bonusHistory.isNotEmpty && final lastBonusIsMultiball = newState.bonusHistory.isNotEmpty &&
newState.bonusHistory.last == GameBonus.dashNest; (newState.bonusHistory.last == GameBonus.dashNest ||
newState.bonusHistory.last == GameBonus.googleWord);
return hasChanged && lastBonusIsMultiball; return hasChanged && lastBonusIsMultiball;
} }

@ -12,7 +12,7 @@ extension PinballGameAssetsX on PinballGame {
const androidTheme = AndroidTheme(); const androidTheme = AndroidTheme();
const dinoTheme = DinoTheme(); const dinoTheme = DinoTheme();
return [ final gameAssets = [
images.load(components.Assets.images.boardBackground.keyName), images.load(components.Assets.images.boardBackground.keyName),
images.load(components.Assets.images.ball.flameEffect.keyName), images.load(components.Assets.images.ball.flameEffect.keyName),
images.load(components.Assets.images.signpost.inactive.keyName), images.load(components.Assets.images.signpost.inactive.keyName),
@ -148,17 +148,21 @@ extension PinballGameAssetsX on PinballGame {
images.load(components.Assets.images.displayArrows.arrowLeft.keyName), images.load(components.Assets.images.displayArrows.arrowLeft.keyName),
images.load(components.Assets.images.displayArrows.arrowRight.keyName), images.load(components.Assets.images.displayArrows.arrowRight.keyName),
images.load(androidTheme.leaderboardIcon.keyName), images.load(androidTheme.leaderboardIcon.keyName),
images.load(androidTheme.background.keyName),
images.load(androidTheme.ball.keyName), images.load(androidTheme.ball.keyName),
images.load(dashTheme.leaderboardIcon.keyName), images.load(dashTheme.leaderboardIcon.keyName),
images.load(dashTheme.background.keyName),
images.load(dashTheme.ball.keyName), images.load(dashTheme.ball.keyName),
images.load(dinoTheme.leaderboardIcon.keyName), images.load(dinoTheme.leaderboardIcon.keyName),
images.load(dinoTheme.background.keyName),
images.load(dinoTheme.ball.keyName), images.load(dinoTheme.ball.keyName),
images.load(sparkyTheme.leaderboardIcon.keyName), images.load(sparkyTheme.leaderboardIcon.keyName),
images.load(sparkyTheme.background.keyName),
images.load(sparkyTheme.ball.keyName), images.load(sparkyTheme.ball.keyName),
]; ];
return (platformHelper.isMobile) ? gameAssets : gameAssets
..addAll([
images.load(androidTheme.background.keyName),
images.load(dashTheme.background.keyName),
images.load(dinoTheme.background.keyName),
images.load(sparkyTheme.background.keyName),
]);
} }
} }

@ -14,6 +14,7 @@ import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_flame/pinball_flame.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
class PinballGame extends PinballForge2DGame class PinballGame extends PinballForge2DGame
@ -25,6 +26,7 @@ class PinballGame extends PinballForge2DGame
required GameBloc gameBloc, required GameBloc gameBloc,
required AppLocalizations l10n, required AppLocalizations l10n,
required PinballAudioPlayer audioPlayer, required PinballAudioPlayer audioPlayer,
required this.platformHelper,
}) : focusNode = FocusNode(), }) : focusNode = FocusNode(),
_gameBloc = gameBloc, _gameBloc = gameBloc,
_audioPlayer = audioPlayer, _audioPlayer = audioPlayer,
@ -57,6 +59,8 @@ class PinballGame extends PinballForge2DGame
final AppLocalizations _l10n; final AppLocalizations _l10n;
final PlatformHelper platformHelper;
final GameBloc _gameBloc; final GameBloc _gameBloc;
List<LeaderboardEntryData>? _entries; List<LeaderboardEntryData>? _entries;
@ -90,6 +94,7 @@ class PinballGame extends PinballForge2DGame
FlameProvider<LeaderboardRepository>.value(leaderboardRepository), FlameProvider<LeaderboardRepository>.value(leaderboardRepository),
FlameProvider<ShareRepository>.value(shareRepository), FlameProvider<ShareRepository>.value(shareRepository),
FlameProvider<AppLocalizations>.value(_l10n), FlameProvider<AppLocalizations>.value(_l10n),
FlameProvider<PlatformHelper>.value(platformHelper),
], ],
children: [ children: [
BonusNoiseBehavior(), BonusNoiseBehavior(),
@ -106,7 +111,7 @@ class PinballGame extends PinballForge2DGame
children: [ children: [
ZCanvasComponent( ZCanvasComponent(
children: [ children: [
ArcadeBackground(), if (!platformHelper.isMobile) ArcadeBackground(),
BoardBackgroundSpriteComponent(), BoardBackgroundSpriteComponent(),
Boundaries(), Boundaries(),
Backbox( Backbox(
@ -197,6 +202,7 @@ class DebugPinballGame extends PinballGame with FPSCounter, PanDetector {
required ShareRepository shareRepository, required ShareRepository shareRepository,
required AppLocalizations l10n, required AppLocalizations l10n,
required PinballAudioPlayer audioPlayer, required PinballAudioPlayer audioPlayer,
required PlatformHelper platformHelper,
required GameBloc gameBloc, required GameBloc gameBloc,
}) : super( }) : super(
characterThemeBloc: characterThemeBloc, characterThemeBloc: characterThemeBloc,
@ -204,6 +210,7 @@ class DebugPinballGame extends PinballGame with FPSCounter, PanDetector {
leaderboardRepository: leaderboardRepository, leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository, shareRepository: shareRepository,
l10n: l10n, l10n: l10n,
platformHelper: platformHelper,
gameBloc: gameBloc, gameBloc: gameBloc,
); );

@ -11,6 +11,7 @@ import 'package:pinball/select_character/select_character.dart';
import 'package:pinball/start_game/start_game.dart'; import 'package:pinball/start_game/start_game.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:pinball_ui/pinball_ui.dart'; import 'package:pinball_ui/pinball_ui.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
class PinballGamePage extends StatelessWidget { class PinballGamePage extends StatelessWidget {
@ -27,6 +28,7 @@ class PinballGamePage extends StatelessWidget {
final audioPlayer = context.read<PinballAudioPlayer>(); final audioPlayer = context.read<PinballAudioPlayer>();
final leaderboardRepository = context.read<LeaderboardRepository>(); final leaderboardRepository = context.read<LeaderboardRepository>();
final shareRepository = context.read<ShareRepository>(); final shareRepository = context.read<ShareRepository>();
final platformHelper = context.read<PlatformHelper>();
final gameBloc = context.read<GameBloc>(); final gameBloc = context.read<GameBloc>();
final game = isDebugMode final game = isDebugMode
? DebugPinballGame( ? DebugPinballGame(
@ -35,6 +37,7 @@ class PinballGamePage extends StatelessWidget {
leaderboardRepository: leaderboardRepository, leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository, shareRepository: shareRepository,
l10n: context.l10n, l10n: context.l10n,
platformHelper: platformHelper,
gameBloc: gameBloc, gameBloc: gameBloc,
) )
: PinballGame( : PinballGame(
@ -43,6 +46,7 @@ class PinballGamePage extends StatelessWidget {
leaderboardRepository: leaderboardRepository, leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository, shareRepository: shareRepository,
l10n: context.l10n, l10n: context.l10n,
platformHelper: platformHelper,
gameBloc: gameBloc, gameBloc: gameBloc,
); );

@ -50,14 +50,11 @@ extension on Control {
} }
class HowToPlayDialog extends StatefulWidget { class HowToPlayDialog extends StatefulWidget {
HowToPlayDialog({ const HowToPlayDialog({
Key? key, Key? key,
required this.onDismissCallback, required this.onDismissCallback,
@visibleForTesting PlatformHelper? platformHelper, }) : super(key: key);
}) : platformHelper = platformHelper ?? PlatformHelper(),
super(key: key);
final PlatformHelper platformHelper;
final VoidCallback onDismissCallback; final VoidCallback onDismissCallback;
@override @override
@ -85,7 +82,7 @@ class _HowToPlayDialogState extends State<HowToPlayDialog> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final isMobile = widget.platformHelper.isMobile; final isMobile = context.read<PlatformHelper>().isMobile;
final l10n = context.l10n; final l10n = context.l10n;
return WillPopScope( return WillPopScope(

@ -218,7 +218,7 @@
"description": "Text to share score on Social Network", "description": "Text to share score on Social Network",
"placeholders": { "placeholders": {
"score": { "score": {
"type": "int" "type": "String"
} }
} }
} }

@ -6,6 +6,7 @@ import 'package:leaderboard_repository/leaderboard_repository.dart';
import 'package:pinball/app/app.dart'; import 'package:pinball/app/app.dart';
import 'package:pinball/bootstrap.dart'; import 'package:pinball/bootstrap.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
void main() { void main() {
@ -15,6 +16,7 @@ void main() {
ShareRepository(appUrl: ShareRepository.pinballGameUrl); ShareRepository(appUrl: ShareRepository.pinballGameUrl);
final authenticationRepository = AuthenticationRepository(firebaseAuth); final authenticationRepository = AuthenticationRepository(firebaseAuth);
final pinballAudioPlayer = PinballAudioPlayer(); final pinballAudioPlayer = PinballAudioPlayer();
final platformHelper = PlatformHelper();
unawaited( unawaited(
Firebase.initializeApp().then( Firebase.initializeApp().then(
(_) => authenticationRepository.authenticateAnonymously(), (_) => authenticationRepository.authenticateAnonymously(),
@ -25,6 +27,7 @@ void main() {
leaderboardRepository: leaderboardRepository, leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository, shareRepository: shareRepository,
pinballAudioPlayer: pinballAudioPlayer, pinballAudioPlayer: pinballAudioPlayer,
platformHelper: platformHelper,
); );
}); });
} }

@ -204,7 +204,7 @@ class _MadeWithFlutterAndFirebase extends StatelessWidget {
abstract class _MoreInformationUrl { abstract class _MoreInformationUrl {
static const flutterWebsite = 'https://flutter.dev'; static const flutterWebsite = 'https://flutter.dev';
static const firebaseWebsite = 'https://firebase.google.com'; static const firebaseWebsite = 'https://firebase.google.com';
static const openSourceCode = 'https://github.com/VGVentures/pinball'; static const openSourceCode = 'https://github.com/flutter/pinball';
static const googleIOEvent = 'https://events.google.com/io/'; static const googleIOEvent = 'https://events.google.com/io/';
static const flutterGamesWebsite = 'http://flutter.dev/games'; static const flutterGamesWebsite = 'http://flutter.dev/games';
static const howItsMadeArticle = static const howItsMadeArticle =

@ -59,7 +59,7 @@ typedef CreateAudioPool = Future<AudioPool> Function(
typedef PlaySingleAudio = Future<void> Function(String); typedef PlaySingleAudio = Future<void> Function(String);
/// Defines the contract for looping a single audio. /// Defines the contract for looping a single audio.
typedef LoopSingleAudio = Future<void> Function(String); typedef LoopSingleAudio = Future<void> Function(String, {double volume});
/// Defines the contract for pre fetching an audio. /// Defines the contract for pre fetching an audio.
typedef PreCacheSingleAudio = Future<void> Function(String); typedef PreCacheSingleAudio = Future<void> Function(String);
@ -101,18 +101,20 @@ class _LoopAudio extends _Audio {
required this.preCacheSingleAudio, required this.preCacheSingleAudio,
required this.loopSingleAudio, required this.loopSingleAudio,
required this.path, required this.path,
this.volume,
}); });
final PreCacheSingleAudio preCacheSingleAudio; final PreCacheSingleAudio preCacheSingleAudio;
final LoopSingleAudio loopSingleAudio; final LoopSingleAudio loopSingleAudio;
final String path; final String path;
final double? volume;
@override @override
Future<void> load() => preCacheSingleAudio(prefixFile(path)); Future<void> load() => preCacheSingleAudio(prefixFile(path));
@override @override
void play() { void play() {
loopSingleAudio(prefixFile(path)); loopSingleAudio(prefixFile(path), volume: volume ?? 1);
} }
} }
@ -121,10 +123,12 @@ class _SingleLoopAudio extends _LoopAudio {
required PreCacheSingleAudio preCacheSingleAudio, required PreCacheSingleAudio preCacheSingleAudio,
required LoopSingleAudio loopSingleAudio, required LoopSingleAudio loopSingleAudio,
required String path, required String path,
double? volume,
}) : super( }) : super(
preCacheSingleAudio: preCacheSingleAudio, preCacheSingleAudio: preCacheSingleAudio,
loopSingleAudio: loopSingleAudio, loopSingleAudio: loopSingleAudio,
path: path, path: path,
volume: volume,
); );
bool _playing = false; bool _playing = false;
@ -296,6 +300,7 @@ class PinballAudioPlayer {
preCacheSingleAudio: _preCacheSingleAudio, preCacheSingleAudio: _preCacheSingleAudio,
loopSingleAudio: _loopSingleAudio, loopSingleAudio: _loopSingleAudio,
path: Assets.music.background, path: Assets.music.background,
volume: .6,
), ),
}; };
} }

@ -33,7 +33,7 @@ class _MockPlaySingleAudio extends Mock {
} }
class _MockLoopSingleAudio extends Mock { class _MockLoopSingleAudio extends Mock {
Future<void> onCall(String url); Future<void> onCall(String url, {double volume});
} }
abstract class _PreCacheSingleAudio { abstract class _PreCacheSingleAudio {
@ -77,7 +77,8 @@ void main() {
when(() => playSingleAudio.onCall(any())).thenAnswer((_) async {}); when(() => playSingleAudio.onCall(any())).thenAnswer((_) async {});
loopSingleAudio = _MockLoopSingleAudio(); loopSingleAudio = _MockLoopSingleAudio();
when(() => loopSingleAudio.onCall(any())).thenAnswer((_) async {}); when(() => loopSingleAudio.onCall(any(), volume: any(named: 'volume')))
.thenAnswer((_) async {});
preCacheSingleAudio = _MockPreCacheSingleAudio(); preCacheSingleAudio = _MockPreCacheSingleAudio();
when(() => preCacheSingleAudio.onCall(any())).thenAnswer((_) async {}); when(() => preCacheSingleAudio.onCall(any())).thenAnswer((_) async {});
@ -443,8 +444,10 @@ void main() {
audioPlayer.play(PinballAudio.backgroundMusic); audioPlayer.play(PinballAudio.backgroundMusic);
verify( verify(
() => loopSingleAudio () => loopSingleAudio.onCall(
.onCall('packages/pinball_audio/${Assets.music.background}'), 'packages/pinball_audio/${Assets.music.background}',
volume: .6,
),
).called(1); ).called(1);
}); });
@ -455,8 +458,10 @@ void main() {
..play(PinballAudio.backgroundMusic); ..play(PinballAudio.backgroundMusic);
verify( verify(
() => loopSingleAudio () => loopSingleAudio.onCall(
.onCall('packages/pinball_audio/${Assets.music.background}'), 'packages/pinball_audio/${Assets.music.background}',
volume: .6,
),
).called(1); ).called(1);
}); });
}); });

@ -9,9 +9,9 @@ import 'package:pinball_flame/pinball_flame.dart';
class MultiballBlinkingBehavior extends TimerComponent class MultiballBlinkingBehavior extends TimerComponent
with ParentIsA<Multiball> { with ParentIsA<Multiball> {
/// {@macro multiball_blinking_behavior} /// {@macro multiball_blinking_behavior}
MultiballBlinkingBehavior() : super(period: 0.1); MultiballBlinkingBehavior() : super(period: 0.18);
final _maxBlinks = 10; final _maxBlinks = 28;
int _blinksCounter = 0; int _blinksCounter = 0;

@ -3,7 +3,7 @@ import 'package:flame/game.dart';
import 'package:sandbox/common/common.dart'; import 'package:sandbox/common/common.dart';
const _path = const _path =
'https://github.com/VGVentures/pinball/tree/main/packages/pinball_components/sandbox/lib/stories/'; 'https://github.com/flutter/pinball/tree/main/packages/pinball_components/sandbox/lib/stories/';
extension StoryAddGame on Story { extension StoryAddGame on Story {
void addGame({ void addGame({

@ -21,7 +21,7 @@ void main() {
'MultiballBlinkingBehavior', 'MultiballBlinkingBehavior',
() { () {
flameTester.testGameWidget( flameTester.testGameWidget(
'calls onBlink every 0.1 seconds when animation state is animated', 'calls onBlink every 0.18 seconds when animation state is animated',
setUp: (game, tester) async { setUp: (game, tester) async {
final behavior = MultiballBlinkingBehavior(); final behavior = MultiballBlinkingBehavior();
final bloc = _MockMultiballCubit(); final bloc = _MockMultiballCubit();
@ -48,7 +48,7 @@ void main() {
verify(bloc.onBlink).called(1); verify(bloc.onBlink).called(1);
await tester.pump(); await tester.pump();
game.update(0.1); game.update(0.18);
await streamController.close(); await streamController.close();
verify(bloc.onBlink).called(1); verify(bloc.onBlink).called(1);
@ -124,7 +124,7 @@ void main() {
); );
flameTester.testGameWidget( flameTester.testGameWidget(
'onTick stops after 10 blinks repetitions', 'onTick stops after 28 blinks',
setUp: (game, tester) async { setUp: (game, tester) async {
final behavior = MultiballBlinkingBehavior(); final behavior = MultiballBlinkingBehavior();
final bloc = _MockMultiballCubit(); final bloc = _MockMultiballCubit();
@ -148,7 +148,7 @@ void main() {
); );
await tester.pump(); await tester.pump();
for (var i = 0; i < 10; i++) { for (var i = 0; i < 28; i++) {
behavior.onTick(); behavior.onTick();
} }

@ -12,13 +12,13 @@ class ShareRepository {
final String _appUrl; final String _appUrl;
/// Url to the Github Open Source Pinball project. /// Url to the Github Open Source Pinball project.
static const openSourceCode = 'https://github.com/VGVentures/pinball'; static const openSourceCode = 'https://github.com/flutter/pinball';
/// Url to the Google IO Event. /// Url to the Google IO Event.
static const googleIOEvent = 'https://events.google.com/io/'; static const googleIOEvent = 'https://events.google.com/io/';
/// Url to the Pinball game. /// Url to the Pinball game.
static const pinballGameUrl = 'https://ashehwkdkdjruejdnensjsjdne.web.app/#/'; static const pinballGameUrl = 'https://pinball.flutter.dev';
/// Returns a url to share the [value] on the given [platform]. /// Returns a url to share the [value] on the given [platform].
/// ///

@ -5,6 +5,7 @@ import 'package:mocktail/mocktail.dart';
import 'package:pinball/app/app.dart'; import 'package:pinball/app/app.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
class _MockAuthenticationRepository extends Mock class _MockAuthenticationRepository extends Mock
@ -17,18 +18,25 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
class _MockShareRepository extends Mock implements ShareRepository {} class _MockShareRepository extends Mock implements ShareRepository {}
class _MockPlatformHelper extends Mock implements PlatformHelper {
@override
bool get isMobile => false;
}
void main() { void main() {
group('App', () { group('App', () {
late AuthenticationRepository authenticationRepository; late AuthenticationRepository authenticationRepository;
late LeaderboardRepository leaderboardRepository; late LeaderboardRepository leaderboardRepository;
late ShareRepository shareRepository; late ShareRepository shareRepository;
late PinballAudioPlayer pinballAudioPlayer; late PinballAudioPlayer pinballAudioPlayer;
late PlatformHelper platformHelper;
setUp(() { setUp(() {
authenticationRepository = _MockAuthenticationRepository(); authenticationRepository = _MockAuthenticationRepository();
leaderboardRepository = _MockLeaderboardRepository(); leaderboardRepository = _MockLeaderboardRepository();
shareRepository = _MockShareRepository(); shareRepository = _MockShareRepository();
pinballAudioPlayer = _MockPinballAudioPlayer(); pinballAudioPlayer = _MockPinballAudioPlayer();
platformHelper = _MockPlatformHelper();
when(pinballAudioPlayer.load).thenAnswer((_) => [Future.value()]); when(pinballAudioPlayer.load).thenAnswer((_) => [Future.value()]);
}); });
@ -39,6 +47,7 @@ void main() {
leaderboardRepository: leaderboardRepository, leaderboardRepository: leaderboardRepository,
shareRepository: shareRepository, shareRepository: shareRepository,
pinballAudioPlayer: pinballAudioPlayer, pinballAudioPlayer: pinballAudioPlayer,
platformHelper: platformHelper,
), ),
); );
await tester.pump(const Duration(milliseconds: 1100)); await tester.pump(const Duration(milliseconds: 1100));

@ -12,6 +12,7 @@ import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_flame/pinball_flame.dart';
import 'package:pinball_theme/pinball_theme.dart' as theme; import 'package:pinball_theme/pinball_theme.dart' as theme;
import 'package:platform_helper/platform_helper.dart';
class _TestGame extends Forge2DGame { class _TestGame extends Forge2DGame {
@override @override
@ -28,12 +29,18 @@ class _TestGame extends Forge2DGame {
Future<void> pump( Future<void> pump(
List<Component> children, { List<Component> children, {
CharacterThemeCubit? characterThemeBloc, CharacterThemeCubit? characterThemeBloc,
PlatformHelper? platformHelper,
}) async { }) async {
await ensureAdd( await ensureAdd(
FlameBlocProvider<CharacterThemeCubit, CharacterThemeState>.value( FlameBlocProvider<CharacterThemeCubit, CharacterThemeState>.value(
value: characterThemeBloc ?? CharacterThemeCubit(), value: characterThemeBloc ?? CharacterThemeCubit(),
children: [
FlameProvider.value(
platformHelper ?? _MockPlatformHelper(),
children: children, children: children,
), ),
],
),
); );
} }
} }
@ -43,6 +50,8 @@ class _MockBallCubit extends Mock implements BallCubit {}
class _MockArcadeBackgroundCubit extends Mock implements ArcadeBackgroundCubit { class _MockArcadeBackgroundCubit extends Mock implements ArcadeBackgroundCubit {
} }
class _MockPlatformHelper extends Mock implements PlatformHelper {}
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
@ -68,8 +77,45 @@ void main() {
); );
flameTester.test( flameTester.test(
'onNewState calls onCharacterSelected on the arcade background bloc', 'onNewState does not call onCharacterSelected on the arcade background '
'bloc when platform is mobile',
(game) async { (game) async {
final platformHelper = _MockPlatformHelper();
when(() => platformHelper.isMobile).thenAnswer((_) => true);
final arcadeBackgroundBloc = _MockArcadeBackgroundCubit();
whenListen(
arcadeBackgroundBloc,
const Stream<ArcadeBackgroundState>.empty(),
initialState: const ArcadeBackgroundState.initial(),
);
final behavior = CharacterSelectionBehavior();
await game.pump(
[
behavior,
ZCanvasComponent(),
Plunger.test(compressionDistance: 10),
Ball.test(),
],
platformHelper: platformHelper,
);
const dinoThemeState = CharacterThemeState(theme.DinoTheme());
behavior.onNewState(dinoThemeState);
await game.ready();
verifyNever(
() => arcadeBackgroundBloc
.onCharacterSelected(dinoThemeState.characterTheme),
);
},
);
flameTester.test(
'onNewState calls onCharacterSelected on the arcade background '
'bloc when platform is not mobile',
(game) async {
final platformHelper = _MockPlatformHelper();
when(() => platformHelper.isMobile).thenAnswer((_) => false);
final arcadeBackgroundBloc = _MockArcadeBackgroundCubit(); final arcadeBackgroundBloc = _MockArcadeBackgroundCubit();
whenListen( whenListen(
arcadeBackgroundBloc, arcadeBackgroundBloc,
@ -79,13 +125,16 @@ void main() {
final arcadeBackground = final arcadeBackground =
ArcadeBackground.test(bloc: arcadeBackgroundBloc); ArcadeBackground.test(bloc: arcadeBackgroundBloc);
final behavior = CharacterSelectionBehavior(); final behavior = CharacterSelectionBehavior();
await game.pump([ await game.pump(
[
arcadeBackground, arcadeBackground,
behavior, behavior,
ZCanvasComponent(), ZCanvasComponent(),
Plunger.test(compressionDistance: 10), Plunger.test(compressionDistance: 10),
Ball.test(), Ball.test(),
]); ],
platformHelper: platformHelper,
);
const dinoThemeState = CharacterThemeState(theme.DinoTheme()); const dinoThemeState = CharacterThemeState(theme.DinoTheme());
behavior.onNewState(dinoThemeState); behavior.onNewState(dinoThemeState);
@ -101,6 +150,8 @@ void main() {
flameTester.test( flameTester.test(
'onNewState calls onCharacterSelected on the ball bloc', 'onNewState calls onCharacterSelected on the ball bloc',
(game) async { (game) async {
final platformHelper = _MockPlatformHelper();
when(() => platformHelper.isMobile).thenAnswer((_) => false);
final ballBloc = _MockBallCubit(); final ballBloc = _MockBallCubit();
whenListen( whenListen(
ballBloc, ballBloc,
@ -109,13 +160,16 @@ void main() {
); );
final ball = Ball.test(bloc: ballBloc); final ball = Ball.test(bloc: ballBloc);
final behavior = CharacterSelectionBehavior(); final behavior = CharacterSelectionBehavior();
await game.pump([ await game.pump(
[
ball, ball,
behavior, behavior,
ZCanvasComponent(), ZCanvasComponent(),
Plunger.test(compressionDistance: 10), Plunger.test(compressionDistance: 10),
ArcadeBackground.test(), ArcadeBackground.test(),
]); ],
platformHelper: platformHelper,
);
const dinoThemeState = CharacterThemeState(theme.DinoTheme()); const dinoThemeState = CharacterThemeState(theme.DinoTheme());
behavior.onNewState(dinoThemeState); behavior.onNewState(dinoThemeState);

@ -47,7 +47,10 @@ class _TestGame extends Forge2DGame
]); ]);
} }
Future<void> pump(Backbox component) async { Future<void> pump(
Backbox component, {
PlatformHelper? platformHelper,
}) async {
// Not needed once https://github.com/flame-engine/flame/issues/1607 // Not needed once https://github.com/flame-engine/flame/issues/1607
// is fixed // is fixed
await onLoad(); await onLoad();
@ -55,8 +58,15 @@ class _TestGame extends Forge2DGame
FlameBlocProvider<GameBloc, GameState>.value( FlameBlocProvider<GameBloc, GameState>.value(
value: GameBloc(), value: GameBloc(),
children: [ children: [
FlameProvider.value( MultiFlameProvider(
providers: [
FlameProvider<AppLocalizations>.value(
_MockAppLocalizations(), _MockAppLocalizations(),
),
FlameProvider<PlatformHelper>.value(
platformHelper ?? _MockPlatformHelper(),
),
],
children: [component], children: [component],
), ),
], ],
@ -89,6 +99,8 @@ class _MockShareRepository extends Mock implements ShareRepository {}
class _MockTapDownInfo extends Mock implements TapDownInfo {} class _MockTapDownInfo extends Mock implements TapDownInfo {}
class _MockTapUpInfo extends Mock implements TapUpInfo {}
class _MockUrlLauncher extends Mock class _MockUrlLauncher extends Mock
with MockPlatformInterfaceMixin with MockPlatformInterfaceMixin
implements UrlLauncherPlatform {} implements UrlLauncherPlatform {}
@ -161,7 +173,7 @@ class _MockAppLocalizations extends Mock implements AppLocalizations {
String get leaderboardErrorMessage => ''; String get leaderboardErrorMessage => '';
@override @override
String iGotScoreAtPinball(int _) => ''; String iGotScoreAtPinball(String _) => '';
} }
void main() { void main() {
@ -191,9 +203,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect(game.descendants(), contains(backbox)); expect(game.descendants(), contains(backbox));
}, },
); );
@ -209,8 +223,8 @@ void main() {
Backbox.test( Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
platformHelper: platformHelper,
), ),
platformHelper: platformHelper,
); );
await tester.pump(); await tester.pump();
}, },
@ -231,9 +245,11 @@ void main() {
initialEntries: [LeaderboardEntryData.empty], initialEntries: [LeaderboardEntryData.empty],
), ),
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
backbox.requestInitials( backbox.requestInitials(
score: 0, score: 0,
character: game.character, character: game.character,
@ -263,9 +279,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
game.onKeyEvent(_mockKeyUp(LogicalKeyboardKey.enter), {}); game.onKeyEvent(_mockKeyUp(LogicalKeyboardKey.enter), {});
verify( verify(
@ -292,9 +310,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game.descendants().whereType<GameOverInfoDisplay>().length, game.descendants().whereType<GameOverInfoDisplay>().length,
@ -322,9 +342,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game.overlays.value, game.overlays.value,
@ -349,9 +371,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game.overlays.value, game.overlays.value,
@ -372,9 +396,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game.descendants().whereType<GameOverInfoDisplay>().length, game.descendants().whereType<GameOverInfoDisplay>().length,
@ -395,9 +421,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
final shareLink = final shareLink =
game.descendants().whereType<ShareLinkComponent>().first; game.descendants().whereType<ShareLinkComponent>().first;
@ -425,9 +453,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game game
@ -457,9 +487,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game.descendants().whereType<ShareDisplay>().length, game.descendants().whereType<ShareDisplay>().length,
@ -504,13 +536,15 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: shareRepository, shareRepository: shareRepository,
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
final facebookButton = final facebookButton =
game.descendants().whereType<FacebookButtonComponent>().first; game.descendants().whereType<FacebookButtonComponent>().first;
facebookButton.onTapDown(_MockTapDownInfo()); facebookButton.onTapUp(_MockTapUpInfo());
await game.ready(); await game.ready();
@ -558,13 +592,15 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: shareRepository, shareRepository: shareRepository,
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
final facebookButton = final facebookButton =
game.descendants().whereType<TwitterButtonComponent>().first; game.descendants().whereType<TwitterButtonComponent>().first;
facebookButton.onTapDown(_MockTapDownInfo()); facebookButton.onTapUp(_MockTapUpInfo());
await game.ready(); await game.ready();
@ -590,9 +626,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game.descendants().whereType<LeaderboardDisplay>().length, game.descendants().whereType<LeaderboardDisplay>().length,
@ -613,9 +651,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
expect( expect(
game.descendants().whereType<LeaderboardFailureDisplay>().length, game.descendants().whereType<LeaderboardFailureDisplay>().length,
@ -637,9 +677,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
backbox.removeFromParent(); backbox.removeFromParent();
await game.ready(); await game.ready();
@ -678,9 +720,11 @@ void main() {
final backbox = Backbox.test( final backbox = Backbox.test(
bloc: bloc, bloc: bloc,
shareRepository: _MockShareRepository(), shareRepository: _MockShareRepository(),
);
await game.pump(
backbox,
platformHelper: platformHelper, platformHelper: platformHelper,
); );
await game.pump(backbox);
game.update(4); game.update(4);
verify( verify(

@ -68,6 +68,8 @@ class _MockAppLocalizations extends Mock implements AppLocalizations {
class _MockTapDownInfo extends Mock implements TapDownInfo {} class _MockTapDownInfo extends Mock implements TapDownInfo {}
class _MockTapUpInfo extends Mock implements TapUpInfo {}
class _MockUrlLauncher extends Mock class _MockUrlLauncher extends Mock
with MockPlatformInterfaceMixin with MockPlatformInterfaceMixin
implements UrlLauncherPlatform {} implements UrlLauncherPlatform {}
@ -135,7 +137,7 @@ void main() {
final googleLink = final googleLink =
component.descendants().whereType<GoogleIOLinkComponent>().first; component.descendants().whereType<GoogleIOLinkComponent>().first;
googleLink.onTapDown(_MockTapDownInfo()); googleLink.onTapUp(_MockTapUpInfo());
await game.ready(); await game.ready();

@ -52,7 +52,7 @@ class _MockAppLocalizations extends Mock implements AppLocalizations {
String get socialMediaAccount => ''; String get socialMediaAccount => '';
} }
class _MockTapDownInfo extends Mock implements TapDownInfo {} class _MockTapUpInfo extends Mock implements TapUpInfo {}
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
@ -74,7 +74,7 @@ void main() {
(game) async { (game) async {
var tapped = false; var tapped = false;
final tapDownInfo = _MockTapDownInfo(); final tapUpInfo = _MockTapUpInfo();
final component = ShareDisplay( final component = ShareDisplay(
onShare: (_) => tapped = true, onShare: (_) => tapped = true,
); );
@ -83,7 +83,7 @@ void main() {
final facebookButton = final facebookButton =
component.descendants().whereType<FacebookButtonComponent>().first; component.descendants().whereType<FacebookButtonComponent>().first;
facebookButton.onTapDown(tapDownInfo); facebookButton.onTapUp(tapUpInfo);
expect(tapped, isTrue); expect(tapped, isTrue);
}, },
@ -94,7 +94,7 @@ void main() {
(game) async { (game) async {
var tapped = false; var tapped = false;
final tapDownInfo = _MockTapDownInfo(); final tapUpInfo = _MockTapUpInfo();
final component = ShareDisplay( final component = ShareDisplay(
onShare: (_) => tapped = true, onShare: (_) => tapped = true,
); );
@ -103,7 +103,7 @@ void main() {
final twitterButton = final twitterButton =
component.descendants().whereType<TwitterButtonComponent>().first; component.descendants().whereType<TwitterButtonComponent>().first;
twitterButton.onTapDown(tapDownInfo); twitterButton.onTapUp(tapUpInfo);
expect(tapped, isTrue); expect(tapped, isTrue);
}, },

@ -15,6 +15,7 @@ import 'package:pinball_audio/pinball_audio.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_flame/pinball_flame.dart';
import 'package:pinball_theme/pinball_theme.dart' as theme; import 'package:pinball_theme/pinball_theme.dart' as theme;
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
class _TestGame extends Forge2DGame with HasTappables { class _TestGame extends Forge2DGame with HasTappables {
@ -55,6 +56,9 @@ class _TestGame extends Forge2DGame with HasTappables {
FlameProvider<AppLocalizations>.value( FlameProvider<AppLocalizations>.value(
_MockAppLocalizations(), _MockAppLocalizations(),
), ),
FlameProvider<PlatformHelper>.value(
_MockPlatformHelper(),
),
], ],
children: children, children: children,
), ),
@ -71,6 +75,11 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
class _MockShareRepository extends Mock implements ShareRepository {} class _MockShareRepository extends Mock implements ShareRepository {}
class _MockPlatformHelper extends Mock implements PlatformHelper {
@override
bool get isMobile => false;
}
class _MockAppLocalizations extends Mock implements AppLocalizations { class _MockAppLocalizations extends Mock implements AppLocalizations {
@override @override
String get score => ''; String get score => '';

@ -8,6 +8,7 @@ import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:flame_test/flame_test.dart'; import 'package:flame_test/flame_test.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart'; import 'package:mocktail/mocktail.dart';
import 'package:pinball/game/behaviors/behaviors.dart';
import 'package:pinball/game/components/google_gallery/behaviors/behaviors.dart'; import 'package:pinball/game/components/google_gallery/behaviors/behaviors.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
@ -116,5 +117,51 @@ void main() {
verify(googleWordBloc.onBonusAwarded).called(1); verify(googleWordBloc.onBonusAwarded).called(1);
}, },
); );
flameTester.testGameWidget(
'adds BonusBallSpawningBehavior to the game when all letters '
'in google word are activated',
setUp: (game, tester) async {
final behavior = GoogleWordBonusBehavior();
final parent = GoogleGallery.test();
final googleWord = GoogleWord(position: Vector2.zero());
final googleWordBloc = _MockGoogleWordCubit();
final streamController = StreamController<GoogleWordState>();
whenListen(
googleWordBloc,
streamController.stream,
initialState: GoogleWordState.initial(),
);
await parent.add(googleWord);
await game.pump(
parent,
gameBloc: gameBloc,
googleWordBloc: googleWordBloc,
);
await parent.ensureAdd(behavior);
streamController.add(
const GoogleWordState(
letterSpriteStates: {
0: GoogleLetterSpriteState.lit,
1: GoogleLetterSpriteState.lit,
2: GoogleLetterSpriteState.lit,
3: GoogleLetterSpriteState.lit,
4: GoogleLetterSpriteState.lit,
5: GoogleLetterSpriteState.lit,
},
),
);
await tester.pump();
await game.ready();
expect(
game.descendants().whereType<BonusBallSpawningBehavior>().length,
equals(1),
);
},
);
}); });
} }

@ -78,8 +78,24 @@ void main() {
); );
test( test(
'is false when the bonusHistory has changed ' 'is true when the bonusHistory has changed '
'with a bonus different than GameBonus.dashNest', () { 'with a new GameBonus.googleWord',
() {
final previous = GameState.initial();
final state = previous.copyWith(
bonusHistory: [GameBonus.googleWord],
);
expect(
MultiballsBehavior().listenWhen(previous, state),
isTrue,
);
},
);
test(
'is false when the bonusHistory has changed with a bonus other than '
'GameBonus.dashNest or GameBonus.googleWord', () {
final previous = final previous =
GameState.initial().copyWith(bonusHistory: [GameBonus.dashNest]); GameState.initial().copyWith(bonusHistory: [GameBonus.dashNest]);
final state = previous.copyWith( final state = previous.copyWith(

@ -16,6 +16,7 @@ import 'package:pinball/game/game.dart';
import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_audio/src/pinball_audio.dart'; import 'package:pinball_audio/src/pinball_audio.dart';
import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/pinball_components.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
class _TestPinballGame extends PinballGame { class _TestPinballGame extends PinballGame {
@ -27,6 +28,7 @@ class _TestPinballGame extends PinballGame {
gameBloc: GameBloc(), gameBloc: GameBloc(),
l10n: _MockAppLocalizations(), l10n: _MockAppLocalizations(),
audioPlayer: _MockPinballAudioPlayer(), audioPlayer: _MockPinballAudioPlayer(),
platformHelper: _MockPlatformHelper(),
); );
@override @override
@ -47,6 +49,7 @@ class _TestDebugPinballGame extends DebugPinballGame {
gameBloc: GameBloc(), gameBloc: GameBloc(),
l10n: _MockAppLocalizations(), l10n: _MockAppLocalizations(),
audioPlayer: _MockPinballAudioPlayer(), audioPlayer: _MockPinballAudioPlayer(),
platformHelper: _MockPlatformHelper(),
); );
@override @override
@ -88,6 +91,11 @@ class _MockShareRepository extends Mock implements ShareRepository {}
class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
class _MockPlatformHelper extends Mock implements PlatformHelper {
@override
bool get isMobile => false;
}
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();

@ -15,6 +15,7 @@ import 'package:pinball/more_information/more_information.dart';
import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/select_character/select_character.dart';
import 'package:pinball/start_game/start_game.dart'; import 'package:pinball/start_game/start_game.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
import '../../helpers/helpers.dart'; import '../../helpers/helpers.dart';
@ -28,6 +29,7 @@ class _TestPinballGame extends PinballGame {
gameBloc: GameBloc(), gameBloc: GameBloc(),
l10n: _MockAppLocalizations(), l10n: _MockAppLocalizations(),
audioPlayer: _MockPinballAudioPlayer(), audioPlayer: _MockPinballAudioPlayer(),
platformHelper: _MockPlatformHelper(),
); );
@override @override
@ -63,6 +65,11 @@ class _MockLeaderboardRepository extends Mock implements LeaderboardRepository {
class _MockShareRepository extends Mock implements ShareRepository {} class _MockShareRepository extends Mock implements ShareRepository {}
class _MockPlatformHelper extends Mock implements PlatformHelper {
@override
bool get isMobile => false;
}
void main() { void main() {
final game = _TestPinballGame(); final game = _TestPinballGame();

@ -12,6 +12,7 @@ import 'package:pinball/select_character/select_character.dart';
import 'package:pinball/start_game/start_game.dart'; import 'package:pinball/start_game/start_game.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:pinball_ui/pinball_ui.dart'; import 'package:pinball_ui/pinball_ui.dart';
import 'package:platform_helper/platform_helper.dart';
import 'package:share_repository/share_repository.dart'; import 'package:share_repository/share_repository.dart';
class _MockAssetsManagerCubit extends Mock implements AssetsManagerCubit {} class _MockAssetsManagerCubit extends Mock implements AssetsManagerCubit {}
@ -29,6 +30,8 @@ class _MockStartGameBloc extends Mock implements StartGameBloc {}
class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
class _MockPlatformHelper extends Mock implements PlatformHelper {}
PinballAudioPlayer _buildDefaultPinballAudioPlayer() { PinballAudioPlayer _buildDefaultPinballAudioPlayer() {
final audioPlayer = _MockPinballAudioPlayer(); final audioPlayer = _MockPinballAudioPlayer();
when(audioPlayer.load).thenAnswer((_) => [Future.value()]); when(audioPlayer.load).thenAnswer((_) => [Future.value()]);
@ -60,6 +63,7 @@ extension PumpApp on WidgetTester {
LeaderboardRepository? leaderboardRepository, LeaderboardRepository? leaderboardRepository,
ShareRepository? shareRepository, ShareRepository? shareRepository,
PinballAudioPlayer? pinballAudioPlayer, PinballAudioPlayer? pinballAudioPlayer,
PlatformHelper? platformHelper,
}) { }) {
return runAsync(() { return runAsync(() {
return pumpWidget( return pumpWidget(
@ -74,6 +78,9 @@ extension PumpApp on WidgetTester {
RepositoryProvider.value( RepositoryProvider.value(
value: pinballAudioPlayer ?? _buildDefaultPinballAudioPlayer(), value: pinballAudioPlayer ?? _buildDefaultPinballAudioPlayer(),
), ),
RepositoryProvider.value(
value: platformHelper ?? _MockPlatformHelper(),
),
], ],
child: MultiBlocProvider( child: MultiBlocProvider(
providers: [ providers: [

@ -17,27 +17,23 @@ void main() {
setUp(() async { setUp(() async {
l10n = await AppLocalizations.delegate.load(const Locale('en')); l10n = await AppLocalizations.delegate.load(const Locale('en'));
platformHelper = _MockPlatformHelper(); platformHelper = _MockPlatformHelper();
when(() => platformHelper.isMobile).thenAnswer((_) => false);
}); });
testWidgets( test('can be instantiated', () {
'can be instantiated without passing in a platform helper', expect(
(tester) async { HowToPlayDialog(onDismissCallback: () {}),
await tester.pumpApp( isA<HowToPlayDialog>(),
HowToPlayDialog(
onDismissCallback: () {},
),
);
expect(find.byType(HowToPlayDialog), findsOneWidget);
},
); );
});
testWidgets('displays content for desktop', (tester) async { testWidgets('displays content for desktop', (tester) async {
when(() => platformHelper.isMobile).thenAnswer((_) => false); when(() => platformHelper.isMobile).thenAnswer((_) => false);
await tester.pumpApp( await tester.pumpApp(
HowToPlayDialog( HowToPlayDialog(
platformHelper: platformHelper,
onDismissCallback: () {}, onDismissCallback: () {},
), ),
platformHelper: platformHelper,
); );
expect(find.text(l10n.howToPlay), findsOneWidget); expect(find.text(l10n.howToPlay), findsOneWidget);
expect(find.text(l10n.tipsForFlips), findsOneWidget); expect(find.text(l10n.tipsForFlips), findsOneWidget);
@ -50,9 +46,9 @@ void main() {
when(() => platformHelper.isMobile).thenAnswer((_) => true); when(() => platformHelper.isMobile).thenAnswer((_) => true);
await tester.pumpApp( await tester.pumpApp(
HowToPlayDialog( HowToPlayDialog(
platformHelper: platformHelper,
onDismissCallback: () {}, onDismissCallback: () {},
), ),
platformHelper: platformHelper,
); );
expect(find.text(l10n.howToPlay), findsOneWidget); expect(find.text(l10n.howToPlay), findsOneWidget);
expect(find.text(l10n.tipsForFlips), findsOneWidget); expect(find.text(l10n.tipsForFlips), findsOneWidget);
@ -75,6 +71,7 @@ void main() {
); );
}, },
), ),
platformHelper: platformHelper,
); );
expect(find.byType(HowToPlayDialog), findsNothing); expect(find.byType(HowToPlayDialog), findsNothing);
await tester.tap(find.text('test')); await tester.tap(find.text('test'));
@ -100,6 +97,7 @@ void main() {
); );
}, },
), ),
platformHelper: platformHelper,
); );
expect(find.byType(HowToPlayDialog), findsNothing); expect(find.byType(HowToPlayDialog), findsNothing);
await tester.tap(find.text('test')); await tester.tap(find.text('test'));

@ -138,7 +138,7 @@ void main() {
); );
<String, String>{ <String, String>{
'Open Source Code': 'https://github.com/VGVentures/pinball', 'Open Source Code': 'https://github.com/flutter/pinball',
'Google I/O': 'https://events.google.com/io/', 'Google I/O': 'https://events.google.com/io/',
'Flutter Games': 'http://flutter.dev/games', 'Flutter Games': 'http://flutter.dev/games',
'How its made': 'How its made':

@ -7,6 +7,7 @@ import 'package:pinball/how_to_play/how_to_play.dart';
import 'package:pinball/select_character/select_character.dart'; import 'package:pinball/select_character/select_character.dart';
import 'package:pinball/start_game/start_game.dart'; import 'package:pinball/start_game/start_game.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
import 'package:platform_helper/platform_helper.dart';
import '../../helpers/helpers.dart'; import '../../helpers/helpers.dart';
@ -18,10 +19,16 @@ class _MockCharacterThemeCubit extends Mock implements CharacterThemeCubit {}
class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {} class _MockPinballAudioPlayer extends Mock implements PinballAudioPlayer {}
class _MockPlatformHelper extends Mock implements PlatformHelper {
@override
bool get isMobile => false;
}
void main() { void main() {
late StartGameBloc startGameBloc; late StartGameBloc startGameBloc;
late PinballAudioPlayer pinballAudioPlayer; late PinballAudioPlayer pinballAudioPlayer;
late CharacterThemeCubit characterThemeCubit; late CharacterThemeCubit characterThemeCubit;
late PlatformHelper platformHelper;
group('StartGameListener', () { group('StartGameListener', () {
setUp(() async { setUp(() async {
@ -30,6 +37,7 @@ void main() {
startGameBloc = _MockStartGameBloc(); startGameBloc = _MockStartGameBloc();
pinballAudioPlayer = _MockPinballAudioPlayer(); pinballAudioPlayer = _MockPinballAudioPlayer();
characterThemeCubit = _MockCharacterThemeCubit(); characterThemeCubit = _MockCharacterThemeCubit();
platformHelper = _MockPlatformHelper();
}); });
group('on selectCharacter status', () { group('on selectCharacter status', () {
@ -121,6 +129,7 @@ void main() {
child: SizedBox.shrink(), child: SizedBox.shrink(),
), ),
startGameBloc: startGameBloc, startGameBloc: startGameBloc,
platformHelper: platformHelper,
); );
await tester.pumpAndSettle(); await tester.pumpAndSettle();
@ -213,6 +222,7 @@ void main() {
child: SizedBox.shrink(), child: SizedBox.shrink(),
), ),
startGameBloc: startGameBloc, startGameBloc: startGameBloc,
platformHelper: platformHelper,
); );
await tester.pumpAndSettle(); await tester.pumpAndSettle();
@ -244,6 +254,7 @@ void main() {
), ),
startGameBloc: startGameBloc, startGameBloc: startGameBloc,
pinballAudioPlayer: pinballAudioPlayer, pinballAudioPlayer: pinballAudioPlayer,
platformHelper: platformHelper,
); );
await tester.pumpAndSettle(); await tester.pumpAndSettle();

Loading…
Cancel
Save