chore: rename SelectCharacterCubit to CharacterThemeCubit

pull/233/head
arturplaczek 3 years ago
parent 464b786760
commit 7c3ee4f687

@ -36,7 +36,7 @@ class App extends StatelessWidget {
RepositoryProvider.value(value: _pinballAudio),
],
child: BlocProvider(
create: (context) => SelectCharacterCubit(),
create: (context) => CharacterThemeCubit(),
child: const MaterialApp(
title: 'I/O Pinball',
localizationsDelegates: [

@ -32,7 +32,7 @@ class PinballGamePage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final selectedCharacter =
context.read<SelectCharacterCubit>().state.selectedCharacter;
context.read<CharacterThemeCubit>().state.selectedCharacter;
final audio = context.read<PinballAudio>();
final pinballAudio = context.read<PinballAudio>();

@ -5,12 +5,12 @@ import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:pinball_theme/pinball_theme.dart';
part 'select_character_state.dart';
part 'character_theme_state.dart';
class SelectCharacterCubit extends Cubit<SelectCharacterState> {
SelectCharacterCubit() : super(const SelectCharacterState.initial());
class CharacterThemeCubit extends Cubit<CharacterThemeState> {
CharacterThemeCubit() : super(const CharacterThemeState.initial());
void characterSelected(CharacterTheme characterTheme) {
emit(SelectCharacterState(characterTheme));
emit(CharacterThemeState(characterTheme));
}
}

@ -1,12 +1,12 @@
// ignore_for_file: public_member_api_docs
// TODO(allisonryan0002): Document this section when the API is stable.
part of 'select_character_cubit.dart';
part of 'character_theme_cubit.dart';
class SelectCharacterState extends Equatable {
const SelectCharacterState(this.selectedCharacter);
class CharacterThemeState extends Equatable {
const CharacterThemeState(this.selectedCharacter);
const SelectCharacterState.initial() : selectedCharacter = const DashTheme();
const CharacterThemeState.initial() : selectedCharacter = const DashTheme();
final CharacterTheme selectedCharacter;

@ -1,2 +1,2 @@
export 'cubit/select_character_cubit.dart';
export 'cubit/character_theme_cubit.dart';
export 'view/view.dart';

@ -19,7 +19,7 @@ class CharacterSelectionDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BlocProvider(
create: (_) => SelectCharacterCubit(),
create: (_) => CharacterThemeCubit(),
child: const CharacterSelectionView(),
);
}
@ -110,14 +110,13 @@ class CharacterImageButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final currentCharacterTheme =
context.select<SelectCharacterCubit, CharacterTheme>(
context.select<CharacterThemeCubit, CharacterTheme>(
(cubit) => cubit.state.selectedCharacter,
);
return GestureDetector(
onTap: () => context
.read<SelectCharacterCubit>()
.characterSelected(characterTheme),
onTap: () =>
context.read<CharacterThemeCubit>().characterSelected(characterTheme),
child: DecoratedBox(
decoration: BoxDecoration(
color: (currentCharacterTheme == characterTheme)

@ -13,18 +13,18 @@ void main() {
final game = PinballTestGame();
group('PinballGamePage', () {
late SelectCharacterCubit selectCharacterCubit;
late CharacterThemeCubit characterThemeCubit;
late GameBloc gameBloc;
setUp(() async {
await Future.wait<void>(game.preLoadAssets());
selectCharacterCubit = MockSelectCharacterCubit();
characterThemeCubit = MockCharacterThemeCubit();
gameBloc = MockGameBloc();
whenListen(
selectCharacterCubit,
const Stream<SelectCharacterState>.empty(),
initialState: const SelectCharacterState.initial(),
characterThemeCubit,
const Stream<CharacterThemeState>.empty(),
initialState: const CharacterThemeState.initial(),
);
whenListen(
@ -37,7 +37,7 @@ void main() {
testWidgets('renders PinballGameView', (tester) async {
await tester.pumpApp(
PinballGamePage(),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
expect(find.byType(PinballGameView), findsOneWidget);
@ -62,7 +62,7 @@ void main() {
game: game,
),
assetsManagerCubit: assetsManagerCubit,
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
expect(
@ -95,7 +95,7 @@ void main() {
game: game,
),
assetsManagerCubit: assetsManagerCubit,
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
gameBloc: gameBloc,
);
@ -126,7 +126,7 @@ void main() {
},
),
),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
await tester.tap(find.text('Tap me'));

@ -35,7 +35,7 @@ class MockGameBloc extends Mock implements GameBloc {}
class MockGameState extends Mock implements GameState {}
class MockSelectCharacterCubit extends Mock implements SelectCharacterCubit {}
class MockCharacterThemeCubit extends Mock implements CharacterThemeCubit {}
class MockLeaderboardBloc extends Mock implements LeaderboardBloc {}

@ -52,7 +52,7 @@ extension PumpApp on WidgetTester {
MockNavigator? navigator,
GameBloc? gameBloc,
AssetsManagerCubit? assetsManagerCubit,
SelectCharacterCubit? selectCharacterCubit,
CharacterThemeCubit? characterThemeCubit,
LeaderboardRepository? leaderboardRepository,
PinballAudio? pinballAudio,
}) {
@ -70,7 +70,7 @@ extension PumpApp on WidgetTester {
child: MultiBlocProvider(
providers: [
BlocProvider.value(
value: selectCharacterCubit ?? MockSelectCharacterCubit(),
value: characterThemeCubit ?? MockCharacterThemeCubit(),
),
BlocProvider.value(
value: gameBloc ?? MockGameBloc(),

@ -4,21 +4,21 @@ import 'package:pinball/select_character/select_character.dart';
import 'package:pinball_theme/pinball_theme.dart';
void main() {
group('SelectCharacterCubit', () {
group('CharacterThemeCubit', () {
test('initial state has Dash character theme', () {
final selectCharacterCubit = SelectCharacterCubit();
final characterThemeCubit = CharacterThemeCubit();
expect(
selectCharacterCubit.state.selectedCharacter,
characterThemeCubit.state.selectedCharacter,
equals(const DashTheme()),
);
});
blocTest<SelectCharacterCubit, SelectCharacterState>(
blocTest<CharacterThemeCubit, CharacterThemeState>(
'charcterSelected emits selected character theme',
build: SelectCharacterCubit.new,
build: CharacterThemeCubit.new,
act: (bloc) => bloc.characterSelected(const SparkyTheme()),
expect: () => [
const SelectCharacterState(SparkyTheme()),
const CharacterThemeState(SparkyTheme()),
],
);
});

@ -6,13 +6,13 @@ import 'package:pinball/select_character/select_character.dart';
void main() {
group('ThemeState', () {
test('can be instantiated', () {
expect(const SelectCharacterState.initial(), isNotNull);
expect(const CharacterThemeState.initial(), isNotNull);
});
test('supports value equality', () {
expect(
SelectCharacterState.initial(),
equals(const SelectCharacterState.initial()),
CharacterThemeState.initial(),
equals(const CharacterThemeState.initial()),
);
});
});

@ -11,14 +11,14 @@ import 'package:pinball_theme/pinball_theme.dart';
import '../../helpers/helpers.dart';
void main() {
late SelectCharacterCubit selectCharacterCubit;
late CharacterThemeCubit characterThemeCubit;
setUp(() {
selectCharacterCubit = MockSelectCharacterCubit();
characterThemeCubit = MockCharacterThemeCubit();
whenListen(
selectCharacterCubit,
const Stream<SelectCharacterState>.empty(),
initialState: const SelectCharacterState.initial(),
characterThemeCubit,
const Stream<CharacterThemeState>.empty(),
initialState: const CharacterThemeState.initial(),
);
});
@ -26,7 +26,7 @@ void main() {
testWidgets('renders CharacterSelectionView', (tester) async {
await tester.pumpApp(
CharacterSelectionDialog(),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
expect(find.byType(CharacterSelectionView), findsOneWidget);
});
@ -46,7 +46,7 @@ void main() {
},
),
),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
await tester.tap(find.text('Tap me'));
@ -61,7 +61,7 @@ void main() {
const titleText = 'Choose your character!';
await tester.pumpApp(
CharacterSelectionView(),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
expect(find.text(titleText), findsOneWidget);
@ -75,12 +75,12 @@ void main() {
await tester.pumpApp(
CharacterSelectionView(),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
await tester.tap(find.byKey(sparkyButtonKey));
verify(() => selectCharacterCubit.characterSelected(SparkyTheme()))
verify(() => characterThemeCubit.characterSelected(SparkyTheme()))
.called(1);
});
@ -88,7 +88,7 @@ void main() {
(tester) async {
await tester.pumpApp(
CharacterSelectionView(),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
await tester.ensureVisible(find.byType(TextButton));
await tester.tap(find.byType(TextButton));
@ -101,7 +101,7 @@ void main() {
testWidgets('CharacterImageButton renders correctly', (tester) async {
await tester.pumpApp(
CharacterImageButton(DashTheme()),
selectCharacterCubit: selectCharacterCubit,
characterThemeCubit: characterThemeCubit,
);
expect(find.byType(Image), findsOneWidget);

Loading…
Cancel
Save