diff --git a/lib/game/components/google_word/behaviors/google_word_bonus_behavior.dart b/lib/game/components/google_word/behaviors/google_word_bonus_behavior.dart index 92664531..cb9ad308 100644 --- a/lib/game/components/google_word/behaviors/google_word_bonus_behavior.dart +++ b/lib/game/components/google_word/behaviors/google_word_bonus_behavior.dart @@ -17,7 +17,7 @@ class GoogleWordBonusBehavior extends Component // https://github.com/flame-engine/flame/pull/1538 letter.bloc.stream.listen((_) { final achievedBonus = googleLetters - .every((letter) => letter.bloc.state == GoogleLetterState.active); + .every((letter) => letter.bloc.state == GoogleLetterState.lit); if (achievedBonus) { gameRef.audio.googleBonus(); diff --git a/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_cubit.dart b/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_cubit.dart index a352e98d..9ef219ff 100644 --- a/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_cubit.dart +++ b/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_cubit.dart @@ -5,13 +5,13 @@ import 'package:bloc/bloc.dart'; part 'google_letter_state.dart'; class GoogleLetterCubit extends Cubit { - GoogleLetterCubit() : super(GoogleLetterState.inactive); + GoogleLetterCubit() : super(GoogleLetterState.dimmed); void onBallContacted() { - emit(GoogleLetterState.active); + emit(GoogleLetterState.lit); } void onReset() { - emit(GoogleLetterState.inactive); + emit(GoogleLetterState.dimmed); } } diff --git a/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_state.dart b/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_state.dart index e1339320..1e5a29e8 100644 --- a/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_state.dart +++ b/packages/pinball_components/lib/src/components/google_letter/cubit/google_letter_state.dart @@ -1,10 +1,8 @@ +// ignore_for_file: public_member_api_docs + part of 'google_letter_cubit.dart'; -/// Indicates the [GoogleLetterCubit]'s current state. enum GoogleLetterState { - /// A lit up letter. - active, - - /// A dimmed letter. - inactive, + lit, + dimmed, } diff --git a/packages/pinball_components/lib/src/components/google_letter/google_letter.dart b/packages/pinball_components/lib/src/components/google_letter/google_letter.dart index f20f6ac3..e92b9809 100644 --- a/packages/pinball_components/lib/src/components/google_letter/google_letter.dart +++ b/packages/pinball_components/lib/src/components/google_letter/google_letter.dart @@ -29,9 +29,9 @@ class GoogleLetter extends BodyComponent with InitialPosition { children: [ _GoogleLetterSpriteGroupComponent( activeAssetPath: _GoogleLetterSpriteGroupComponent - .spritePaths[index][GoogleLetterState.active]!, + .spritePaths[index][GoogleLetterState.lit]!, inactiveAssetPath: _GoogleLetterSpriteGroupComponent - .spritePaths[index][GoogleLetterState.inactive]!, + .spritePaths[index][GoogleLetterState.dimmed]!, current: bloc.state, ), GoogleLetterBallContactBehavior(), @@ -96,33 +96,33 @@ class _GoogleLetterSpriteGroupComponent static final spritePaths = >[ { - GoogleLetterState.active: Assets.images.googleWord.letter1.active.keyName, - GoogleLetterState.inactive: + GoogleLetterState.lit: Assets.images.googleWord.letter1.active.keyName, + GoogleLetterState.dimmed: Assets.images.googleWord.letter1.inactive.keyName, }, { - GoogleLetterState.active: Assets.images.googleWord.letter2.active.keyName, - GoogleLetterState.inactive: + GoogleLetterState.lit: Assets.images.googleWord.letter2.active.keyName, + GoogleLetterState.dimmed: Assets.images.googleWord.letter2.inactive.keyName, }, { - GoogleLetterState.active: Assets.images.googleWord.letter3.active.keyName, - GoogleLetterState.inactive: + GoogleLetterState.lit: Assets.images.googleWord.letter3.active.keyName, + GoogleLetterState.dimmed: Assets.images.googleWord.letter3.inactive.keyName, }, { - GoogleLetterState.active: Assets.images.googleWord.letter4.active.keyName, - GoogleLetterState.inactive: + GoogleLetterState.lit: Assets.images.googleWord.letter4.active.keyName, + GoogleLetterState.dimmed: Assets.images.googleWord.letter4.inactive.keyName, }, { - GoogleLetterState.active: Assets.images.googleWord.letter5.active.keyName, - GoogleLetterState.inactive: + GoogleLetterState.lit: Assets.images.googleWord.letter5.active.keyName, + GoogleLetterState.dimmed: Assets.images.googleWord.letter5.inactive.keyName, }, { - GoogleLetterState.active: Assets.images.googleWord.letter6.active.keyName, - GoogleLetterState.inactive: + GoogleLetterState.lit: Assets.images.googleWord.letter6.active.keyName, + GoogleLetterState.dimmed: Assets.images.googleWord.letter6.inactive.keyName, }, ]; @@ -133,10 +133,10 @@ class _GoogleLetterSpriteGroupComponent parent.bloc.stream.listen((state) => current = state); final sprites = { - GoogleLetterState.active: Sprite( + GoogleLetterState.lit: Sprite( gameRef.images.fromCache(_activeAssetPath), ), - GoogleLetterState.inactive: Sprite( + GoogleLetterState.dimmed: Sprite( gameRef.images.fromCache(_inactiveAssetPath), ), }; diff --git a/packages/pinball_components/test/src/components/google_letter/behaviors/google_letter_ball_contact_behavior_test.dart b/packages/pinball_components/test/src/components/google_letter/behaviors/google_letter_ball_contact_behavior_test.dart index bf261460..12c596e6 100644 --- a/packages/pinball_components/test/src/components/google_letter/behaviors/google_letter_ball_contact_behavior_test.dart +++ b/packages/pinball_components/test/src/components/google_letter/behaviors/google_letter_ball_contact_behavior_test.dart @@ -31,7 +31,7 @@ void main() { whenListen( bloc, const Stream.empty(), - initialState: GoogleLetterState.active, + initialState: GoogleLetterState.lit, ); final googleLetter = GoogleLetter.test(bloc: bloc); diff --git a/packages/pinball_components/test/src/components/google_letter/cubit/google_letter_cubit_test.dart b/packages/pinball_components/test/src/components/google_letter/cubit/google_letter_cubit_test.dart index 390aa192..812e86de 100644 --- a/packages/pinball_components/test/src/components/google_letter/cubit/google_letter_cubit_test.dart +++ b/packages/pinball_components/test/src/components/google_letter/cubit/google_letter_cubit_test.dart @@ -10,14 +10,14 @@ void main() { 'onBallContacted emits active', build: GoogleLetterCubit.new, act: (bloc) => bloc.onBallContacted(), - expect: () => [GoogleLetterState.active], + expect: () => [GoogleLetterState.lit], ); blocTest( 'onReset emits inactive', build: GoogleLetterCubit.new, act: (bloc) => bloc.onReset(), - expect: () => [GoogleLetterState.inactive], + expect: () => [GoogleLetterState.dimmed], ); }, ); diff --git a/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart b/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart index e31dbf31..ea8b750e 100644 --- a/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart +++ b/packages/pinball_components/test/src/components/google_letter/google_letter_test.dart @@ -108,7 +108,7 @@ void main() { whenListen( bloc, const Stream.empty(), - initialState: GoogleLetterState.active, + initialState: GoogleLetterState.lit, ); when(bloc.close).thenAnswer((_) async {}); final googleLetter = GoogleLetter.test(bloc: bloc);