msb-public
/
pinball
mirror of https://github.com/flutter/pinball.git
1
0
Code Issues Projects Releases Wiki Activity

refactor: changed names and removed replaying

Browse Source
pull/359/head
RuiAlonso 3 years ago
parent d3c1166964
commit 9626b88156
9 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
lib/game/bloc/game_state.dart
Unescape View File

@ -23,14 +23,12 @@ enum GameBonus {
enum GameStatus { enum GameStatus {
waiting, waiting,
playing, playing,
replaying,
gameOver, gameOver,
} }
extension GameStatusX on GameStatus { extension GameStatusX on GameStatus {
bool get isWaiting => this == GameStatus.waiting; bool get isWaiting => this == GameStatus.waiting;
bool get isPlaying => bool get isPlaying => this == GameStatus.playing;
this == GameStatus.playing || this == GameStatus.replaying;
bool get isGameOver => this == GameStatus.gameOver; bool get isGameOver => this == GameStatus.gameOver;
} }

2
lib/game/components/backbox/backbox.dart
Unescape View File

@ -73,7 +73,7 @@ class Backbox extends PositionComponent with ZIndex {
InfoDisplay( InfoDisplay(
onShare: () { onShare: () {
_bloc.add( _bloc.add(
ScoreShareRequested( ShareScoreRequested(
score: state.score, score: state.score,
initials: state.initials, initials: state.initials,
character: state.character, character: state.character,

4
lib/game/components/backbox/bloc/backbox_bloc.dart
Unescape View File

@ -18,7 +18,7 @@ class BackboxBloc extends Bloc<BackboxEvent, BackboxState> {
super(LoadingState()) { super(LoadingState()) {
on<PlayerInitialsRequested>(_onPlayerInitialsRequested); on<PlayerInitialsRequested>(_onPlayerInitialsRequested);
on<PlayerInitialsSubmitted>(_onPlayerInitialsSubmitted); on<PlayerInitialsSubmitted>(_onPlayerInitialsSubmitted);
on<ScoreShareRequested>(_onScoreShareRequested); on<ShareScoreRequested>(_onScoreShareRequested);
} }
final LeaderboardRepository _leaderboardRepository; final LeaderboardRepository _leaderboardRepository;
@ -62,7 +62,7 @@ class BackboxBloc extends Bloc<BackboxEvent, BackboxState> {
} }
Future<void> _onScoreShareRequested( Future<void> _onScoreShareRequested(
ScoreShareRequested event, ShareScoreRequested event,
Emitter<BackboxState> emit, Emitter<BackboxState> emit,
) async { ) async {
emit( emit(

8
lib/game/components/backbox/bloc/backbox_event.dart
Unescape View File

@ -52,12 +52,12 @@ class PlayerInitialsSubmitted extends BackboxEvent {
List<Object?> get props => [score, initials, character]; List<Object?> get props => [score, initials, character];
} }
/// {@template score_share_requested} /// {@template share_score_requested}
/// Event that request the user to share score and initials. /// Event that request the user to share score and initials.
/// {@endtemplate} /// {@endtemplate}
class ScoreShareRequested extends BackboxEvent { class ShareScoreRequested extends BackboxEvent {
/// {@macro score_share_requested} /// {@macro share_score_requested}
const ScoreShareRequested({ const ShareScoreRequested({
required this.score, required this.score,
required this.initials, required this.initials,
required this.character, required this.character,

3
lib/game/components/game_bloc_status_listener.dart
Unescape View File

@ -22,9 +22,6 @@ class GameBlocStatusListener extends Component
readProvider<PinballPlayer>().play(PinballAudio.backgroundMusic); readProvider<PinballPlayer>().play(PinballAudio.backgroundMusic);
gameRef.overlays.remove(PinballGame.playButtonOverlay); gameRef.overlays.remove(PinballGame.playButtonOverlay);
break; break;
case GameStatus.replaying:
gameRef.overlays.remove(PinballGame.replayButtonOverlay);
break;
case GameStatus.gameOver: case GameStatus.gameOver:
readProvider<PinballPlayer>().play(PinballAudio.gameOverVoiceOver); readProvider<PinballPlayer>().play(PinballAudio.gameOverVoiceOver);
gameRef.descendants().whereType<Backbox>().first.requestInitials( gameRef.descendants().whereType<Backbox>().first.requestInitials(

2
test/game/components/backbox/backbox_test.dart
Unescape View File

@ -260,7 +260,7 @@ void main() {
verify( verify(
() => bloc.add( () => bloc.add(
ScoreShareRequested( ShareScoreRequested(
score: state.score, score: state.score,
initials: state.initials, initials: state.initials,
character: state.character, character: state.character,

2
test/game/components/backbox/bloc/backbox_bloc_test.dart
Unescape View File

@ -100,7 +100,7 @@ void main() {
}, },
build: () => BackboxBloc(leaderboardRepository: leaderboardRepository), build: () => BackboxBloc(leaderboardRepository: leaderboardRepository),
act: (bloc) => bloc.add( act: (bloc) => bloc.add(
ScoreShareRequested( ShareScoreRequested(
score: 100, score: 100,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),

18
test/game/components/backbox/bloc/backbox_event_test.dart
Unescape View File

@ -126,7 +126,7 @@ void main() {
group('ScoreShareRequested', () { group('ScoreShareRequested', () {
test('can be instantiated', () { test('can be instantiated', () {
expect( expect(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),
@ -137,13 +137,13 @@ void main() {
test('supports value comparison', () { test('supports value comparison', () {
expect( expect(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),
), ),
equals( equals(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),
@ -152,14 +152,14 @@ void main() {
); );
expect( expect(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),
), ),
isNot( isNot(
equals( equals(
ScoreShareRequested( ShareScoreRequested(
score: 1, score: 1,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),
@ -169,14 +169,14 @@ void main() {
); );
expect( expect(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),
), ),
isNot( isNot(
equals( equals(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'AAA', initials: 'AAA',
character: SparkyTheme(), character: SparkyTheme(),
@ -186,14 +186,14 @@ void main() {
); );
expect( expect(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'AAA', initials: 'AAA',
character: AndroidTheme(), character: AndroidTheme(),
), ),
isNot( isNot(
equals( equals(
ScoreShareRequested( ShareScoreRequested(
score: 0, score: 0,
initials: 'BBB', initials: 'BBB',
character: AndroidTheme(), character: AndroidTheme(),

8
test/game/components/backbox/displays/info_display_test.dart
Unescape View File

@ -98,7 +98,7 @@ void main() {
); );
flameTester.testGameWidget( flameTester.testGameWidget(
'calls onNavigate when Go to IO link is tapped', 'calls onNavigate when go to IO link is tapped',
setUp: (game, tester) async { setUp: (game, tester) async {
var tapped = false; var tapped = false;
@ -108,10 +108,10 @@ void main() {
); );
await game.pump(component); await game.pump(component);
final gotoLink = final googleLink =
component.descendants().whereType<GotoIOLinkComponent>().first; component.descendants().whereType<GoogleIOLinkComponent>().first;
gotoLink.onTapDown(tapDownInfo); googleLink.onTapDown(tapDownInfo);
expect(tapped, isTrue); expect(tapped, isTrue);
}, },

Write Preview
Loading…
Cancel
Save