feat: pr suggestions

pull/341/head
Erick Zanardo 3 years ago
parent 7b85acc69b
commit d4d0ff719a

@ -1,6 +1,8 @@
import 'dart:async'; import 'dart:async';
import 'package:flame/components.dart'; import 'package:flame/components.dart';
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/bloc/backbox_bloc.dart';
import 'package:pinball/game/components/backbox/displays/displays.dart'; import 'package:pinball/game/components/backbox/displays/displays.dart';
import 'package:pinball/game/pinball_game.dart'; import 'package:pinball/game/pinball_game.dart';
@ -14,18 +16,14 @@ import 'package:pinball_theme/pinball_theme.dart' hide Assets;
class Backbox extends PositionComponent with HasGameRef<PinballGame>, ZIndex { class Backbox extends PositionComponent with HasGameRef<PinballGame>, ZIndex {
/// {@macro backbox} /// {@macro backbox}
Backbox({ Backbox({
required LeaderboardRepository leaderboardRepository,
}) : _bloc = BackboxBloc(leaderboardRepository: leaderboardRepository);
/// {@macro backbox}
@visibleForTesting
Backbox.test({
required BackboxBloc bloc, required BackboxBloc bloc,
}) : _bloc = bloc, }) : _bloc = bloc;
super(
position: Vector2(0, -87),
anchor: Anchor.bottomCenter,
children: [
_BackboxSpriteComponent(),
],
) {
zIndex = ZIndexes.backbox;
add(_display = Component());
}
late final Component _display; late final Component _display;
final BackboxBloc _bloc; final BackboxBloc _bloc;
@ -33,6 +31,13 @@ class Backbox extends PositionComponent with HasGameRef<PinballGame>, ZIndex {
@override @override
Future<void> onLoad() async { Future<void> onLoad() async {
position = Vector2(0, -87);
anchor = Anchor.bottomCenter;
zIndex = ZIndexes.backbox;
await add(_BackboxSpriteComponent());
await add(_display = Component());
_subscription = _bloc.stream.listen((state) { _subscription = _bloc.stream.listen((state) {
_display.children.removeWhere((_) => true); _display.children.removeWhere((_) => true);
_build(state); _build(state);

@ -9,7 +9,6 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:leaderboard_repository/leaderboard_repository.dart'; import 'package:leaderboard_repository/leaderboard_repository.dart';
import 'package:pinball/game/behaviors/behaviors.dart'; import 'package:pinball/game/behaviors/behaviors.dart';
import 'package:pinball/game/components/backbox/bloc/backbox_bloc.dart';
import 'package:pinball/game/game.dart'; import 'package:pinball/game/game.dart';
import 'package:pinball/l10n/l10n.dart'; import 'package:pinball/l10n/l10n.dart';
import 'package:pinball_audio/pinball_audio.dart'; import 'package:pinball_audio/pinball_audio.dart';
@ -54,7 +53,7 @@ class PinballGame extends PinballForge2DGame
final machine = [ final machine = [
BoardBackgroundSpriteComponent(), BoardBackgroundSpriteComponent(),
Boundaries(), Boundaries(),
Backbox(bloc: BackboxBloc(leaderboardRepository: leaderboardRepository)), Backbox(leaderboardRepository: leaderboardRepository),
]; ];
final decals = [ final decals = [
GoogleWord(position: Vector2(-4.25, 1.8)), GoogleWord(position: Vector2(-4.25, 1.8)),

@ -91,7 +91,7 @@ void main() {
flameTester.test( flameTester.test(
'loads correctly', 'loads correctly',
(game) async { (game) async {
final backbox = Backbox(bloc: bloc); final backbox = Backbox.test(bloc: bloc);
await game.ensureAdd(backbox); await game.ensureAdd(backbox);
expect(game.children, contains(backbox)); expect(game.children, contains(backbox));
@ -106,7 +106,7 @@ void main() {
..followVector2(Vector2(0, -130)) ..followVector2(Vector2(0, -130))
..zoom = 6; ..zoom = 6;
await game.ensureAdd( await game.ensureAdd(
Backbox(bloc: bloc), Backbox.test(bloc: bloc),
); );
await tester.pump(); await tester.pump();
}, },
@ -121,7 +121,7 @@ void main() {
flameTester.test( flameTester.test(
'requestInitials adds InitialsInputDisplay', 'requestInitials adds InitialsInputDisplay',
(game) async { (game) async {
final backbox = Backbox( final backbox = Backbox.test(
bloc: BackboxBloc( bloc: BackboxBloc(
leaderboardRepository: _MockLeaderboardRepository(), leaderboardRepository: _MockLeaderboardRepository(),
), ),
@ -153,7 +153,7 @@ void main() {
Stream.value(state), Stream.value(state),
initialState: state, initialState: state,
); );
final backbox = Backbox(bloc: bloc); final backbox = Backbox.test(bloc: bloc);
await game.ensureAdd(backbox); await game.ensureAdd(backbox);
game.onKeyEvent(_mockKeyUp(LogicalKeyboardKey.enter), {}); game.onKeyEvent(_mockKeyUp(LogicalKeyboardKey.enter), {});
@ -177,7 +177,7 @@ void main() {
Stream.value(InitialsSuccessState()), Stream.value(InitialsSuccessState()),
initialState: InitialsSuccessState(), initialState: InitialsSuccessState(),
); );
final backbox = Backbox(bloc: bloc); final backbox = Backbox.test(bloc: bloc);
await game.ensureAdd(backbox); await game.ensureAdd(backbox);
expect( expect(
@ -198,7 +198,7 @@ void main() {
Stream.value(InitialsFailureState()), Stream.value(InitialsFailureState()),
initialState: InitialsFailureState(), initialState: InitialsFailureState(),
); );
final backbox = Backbox(bloc: bloc); final backbox = Backbox.test(bloc: bloc);
await game.ensureAdd(backbox); await game.ensureAdd(backbox);
expect( expect(
@ -214,7 +214,7 @@ void main() {
flameTester.test( flameTester.test(
'closes the subscription when it is removed', 'closes the subscription when it is removed',
(game) async { (game) async {
final backbox = Backbox(bloc: bloc); final backbox = Backbox.test(bloc: bloc);
await game.ensureAdd(backbox); await game.ensureAdd(backbox);
backbox.removeFromParent(); backbox.removeFromParent();

Loading…
Cancel
Save