feat: provide and listen to `CharacterThemeCubit` in game (#375)
* feat: connect game ball to theme selection * chore: swap out ball assets * chore: swap out flipper assets * fix: ball spawn layer * refactor: use readBloc and fix tests * refactor: update ball sprite onlypull/358/head
Allison Ryan
2 years ago
committed by
alestiago
@ -0,0 +1,20 @@
|
||||
import 'package:flame/components.dart';
|
||||
import 'package:flame_bloc/flame_bloc.dart';
|
||||
import 'package:pinball/select_character/select_character.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
|
||||
/// Updates the launch [Ball] to reflect character selections.
|
||||
class BallThemingBehavior extends Component
|
||||
with
|
||||
FlameBlocListenable<CharacterThemeCubit, CharacterThemeState>,
|
||||
HasGameRef {
|
||||
@override
|
||||
void onNewState(CharacterThemeState state) {
|
||||
gameRef
|
||||
.descendants()
|
||||
.whereType<Ball>()
|
||||
.single
|
||||
.bloc
|
||||
.onThemeChanged(state.characterTheme);
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 10 KiB |
@ -0,0 +1,15 @@
|
||||
// ignore_for_file: public_member_api_docs
|
||||
|
||||
import 'package:bloc/bloc.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:pinball_theme/pinball_theme.dart';
|
||||
|
||||
part 'ball_state.dart';
|
||||
|
||||
class BallCubit extends Cubit<BallState> {
|
||||
BallCubit() : super(const BallState.initial());
|
||||
|
||||
void onThemeChanged(CharacterTheme characterTheme) {
|
||||
emit(BallState(characterTheme: characterTheme));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
// ignore_for_file: public_member_api_docs
|
||||
|
||||
part of 'ball_cubit.dart';
|
||||
|
||||
class BallState extends Equatable {
|
||||
const BallState({required this.characterTheme});
|
||||
|
||||
const BallState.initial() : this(characterTheme: const DashTheme());
|
||||
|
||||
final CharacterTheme characterTheme;
|
||||
|
||||
@override
|
||||
List<Object> get props => [characterTheme];
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
import 'package:bloc_test/bloc_test.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
import 'package:pinball_theme/pinball_theme.dart';
|
||||
|
||||
void main() {
|
||||
group(
|
||||
'BallCubit',
|
||||
() {
|
||||
blocTest<BallCubit, BallState>(
|
||||
'onThemeChanged emits new theme',
|
||||
build: BallCubit.new,
|
||||
act: (bloc) => bloc.onThemeChanged(const DinoTheme()),
|
||||
expect: () => [const BallState(characterTheme: DinoTheme())],
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
// ignore_for_file: prefer_const_constructors
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:pinball_components/pinball_components.dart';
|
||||
import 'package:pinball_theme/pinball_theme.dart';
|
||||
|
||||
void main() {
|
||||
group('BallState', () {
|
||||
test('supports value equality', () {
|
||||
expect(
|
||||
BallState(characterTheme: DashTheme()),
|
||||
equals(const BallState(characterTheme: DashTheme())),
|
||||
);
|
||||
});
|
||||
|
||||
group('constructor', () {
|
||||
test('can be instantiated', () {
|
||||
expect(const BallState(characterTheme: DashTheme()), isNotNull);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 9.6 KiB |
@ -0,0 +1,93 @@
|
||||
// ignore_for_file: cascade_invocations
|
||||
|
||||
import 'package:bloc_test/bloc_test.dart';
|
||||
import 'package:flame/components.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_test/flutter_test.dart';
|
||||
import 'package:mocktail/mocktail.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<void> onLoad() async {
|
||||
images.prefix = '';
|
||||
await images.loadAll([
|
||||
theme.Assets.images.dash.ball.keyName,
|
||||
theme.Assets.images.dino.ball.keyName,
|
||||
]);
|
||||
}
|
||||
|
||||
Future<void> pump(
|
||||
List<Component> children, {
|
||||
CharacterThemeCubit? characterThemeBloc,
|
||||
}) async {
|
||||
await ensureAdd(
|
||||
FlameBlocProvider<CharacterThemeCubit, CharacterThemeState>.value(
|
||||
value: characterThemeBloc ?? CharacterThemeCubit(),
|
||||
children: children,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _MockBallCubit extends Mock implements BallCubit {}
|
||||
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
group(
|
||||
'BallThemingBehavior',
|
||||
() {
|
||||
final flameTester = FlameTester(_TestGame.new);
|
||||
|
||||
test('can be instantiated', () {
|
||||
expect(
|
||||
BallThemingBehavior(),
|
||||
isA<BallThemingBehavior>(),
|
||||
);
|
||||
});
|
||||
|
||||
flameTester.test(
|
||||
'loads',
|
||||
(game) async {
|
||||
final behavior = BallThemingBehavior();
|
||||
await game.pump([behavior]);
|
||||
expect(game.descendants(), contains(behavior));
|
||||
},
|
||||
);
|
||||
|
||||
flameTester.test(
|
||||
'onNewState calls onThemeChanged on the ball bloc',
|
||||
(game) async {
|
||||
final ballBloc = _MockBallCubit();
|
||||
whenListen(
|
||||
ballBloc,
|
||||
const Stream<BallState>.empty(),
|
||||
initialState: const BallState.initial(),
|
||||
);
|
||||
final ball = Ball.test(bloc: ballBloc);
|
||||
final behavior = BallThemingBehavior();
|
||||
await game.pump([
|
||||
ball,
|
||||
behavior,
|
||||
ZCanvasComponent(),
|
||||
Plunger.test(compressionDistance: 10),
|
||||
]);
|
||||
|
||||
const dinoThemeState = CharacterThemeState(theme.DinoTheme());
|
||||
behavior.onNewState(dinoThemeState);
|
||||
await game.ready();
|
||||
|
||||
verify(() => ballBloc.onThemeChanged(dinoThemeState.characterTheme))
|
||||
.called(1);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||