From d61f8e313117e80de55ba735f9600691508ec694 Mon Sep 17 00:00:00 2001 From: alestiago Date: Mon, 2 May 2022 11:58:39 +0100 Subject: [PATCH] refactor: renamed Assets paths --- lib/game/game_assets.dart | 24 +++++++++---------- .../google_word/google_letter_game.dart | 4 ++-- .../google_letter/google_letter_test.dart | 24 +++++++++---------- .../google_word_bonus_behavior_test.dart | 24 +++++++++---------- .../google_word/google_word_test.dart | 24 +++++++++---------- test/game/pinball_game_test.dart | 24 +++++++++---------- 6 files changed, 62 insertions(+), 62 deletions(-) diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index 6bdb5a91..1b8ae0f6 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -101,18 +101,18 @@ extension PinballGameAssetsX on PinballGame { images.load(components.Assets.images.sparky.bumper.c.dimmed.keyName), images.load(components.Assets.images.backboard.backboardScores.keyName), images.load(components.Assets.images.backboard.backboardGameOver.keyName), - images.load(components.Assets.images.googleWord.letter1.active.keyName), - images.load(components.Assets.images.googleWord.letter1.inactive.keyName), - images.load(components.Assets.images.googleWord.letter2.active.keyName), - images.load(components.Assets.images.googleWord.letter2.inactive.keyName), - images.load(components.Assets.images.googleWord.letter3.active.keyName), - images.load(components.Assets.images.googleWord.letter3.inactive.keyName), - images.load(components.Assets.images.googleWord.letter4.active.keyName), - images.load(components.Assets.images.googleWord.letter4.inactive.keyName), - images.load(components.Assets.images.googleWord.letter5.active.keyName), - images.load(components.Assets.images.googleWord.letter5.inactive.keyName), - images.load(components.Assets.images.googleWord.letter6.active.keyName), - images.load(components.Assets.images.googleWord.letter6.inactive.keyName), + images.load(components.Assets.images.googleWord.letter1.lit.keyName), + images.load(components.Assets.images.googleWord.letter1.dimmed.keyName), + images.load(components.Assets.images.googleWord.letter2.lit.keyName), + images.load(components.Assets.images.googleWord.letter2.dimmed.keyName), + images.load(components.Assets.images.googleWord.letter3.lit.keyName), + images.load(components.Assets.images.googleWord.letter3.dimmed.keyName), + images.load(components.Assets.images.googleWord.letter4.lit.keyName), + images.load(components.Assets.images.googleWord.letter4.dimmed.keyName), + images.load(components.Assets.images.googleWord.letter5.lit.keyName), + images.load(components.Assets.images.googleWord.letter5.dimmed.keyName), + images.load(components.Assets.images.googleWord.letter6.lit.keyName), + images.load(components.Assets.images.googleWord.letter6.dimmed.keyName), images.load(components.Assets.images.backboard.display.keyName), images.load(components.Assets.images.multiplier.x2.lit.keyName), images.load(components.Assets.images.multiplier.x2.dimmed.keyName), diff --git a/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart b/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart index b44720e5..bc537de2 100644 --- a/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/google_word/google_letter_game.dart @@ -10,8 +10,8 @@ class GoogleLetterGame extends BallGame { : super( color: const Color(0xFF009900), imagesFileNames: [ - Assets.images.googleWord.letter1.active.keyName, - Assets.images.googleWord.letter1.inactive.keyName, + Assets.images.googleWord.letter1.lit.keyName, + Assets.images.googleWord.letter1.dimmed.keyName, ], ); 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 ea8b750e..be1f9743 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 @@ -13,18 +13,18 @@ import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.googleWord.letter1.active.keyName, - Assets.images.googleWord.letter1.inactive.keyName, - Assets.images.googleWord.letter2.active.keyName, - Assets.images.googleWord.letter2.inactive.keyName, - Assets.images.googleWord.letter3.active.keyName, - Assets.images.googleWord.letter3.inactive.keyName, - Assets.images.googleWord.letter4.active.keyName, - Assets.images.googleWord.letter4.inactive.keyName, - Assets.images.googleWord.letter5.active.keyName, - Assets.images.googleWord.letter5.inactive.keyName, - Assets.images.googleWord.letter6.active.keyName, - Assets.images.googleWord.letter6.inactive.keyName, + Assets.images.googleWord.letter1.lit.keyName, + Assets.images.googleWord.letter1.dimmed.keyName, + Assets.images.googleWord.letter2.lit.keyName, + Assets.images.googleWord.letter2.dimmed.keyName, + Assets.images.googleWord.letter3.lit.keyName, + Assets.images.googleWord.letter3.dimmed.keyName, + Assets.images.googleWord.letter4.lit.keyName, + Assets.images.googleWord.letter4.dimmed.keyName, + Assets.images.googleWord.letter5.lit.keyName, + Assets.images.googleWord.letter5.dimmed.keyName, + Assets.images.googleWord.letter6.lit.keyName, + Assets.images.googleWord.letter6.dimmed.keyName, ]; final flameTester = FlameTester(() => TestGame(assets)); diff --git a/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart b/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart index 1facedf0..97efc207 100644 --- a/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart +++ b/test/game/components/google_word/behaviors/google_word_bonus_behavior_test.dart @@ -13,18 +13,18 @@ import '../../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.googleWord.letter1.active.keyName, - Assets.images.googleWord.letter1.inactive.keyName, - Assets.images.googleWord.letter2.active.keyName, - Assets.images.googleWord.letter2.inactive.keyName, - Assets.images.googleWord.letter3.active.keyName, - Assets.images.googleWord.letter3.inactive.keyName, - Assets.images.googleWord.letter4.active.keyName, - Assets.images.googleWord.letter4.inactive.keyName, - Assets.images.googleWord.letter5.active.keyName, - Assets.images.googleWord.letter5.inactive.keyName, - Assets.images.googleWord.letter6.active.keyName, - Assets.images.googleWord.letter6.inactive.keyName, + Assets.images.googleWord.letter1.lit.keyName, + Assets.images.googleWord.letter1.dimmed.keyName, + Assets.images.googleWord.letter2.lit.keyName, + Assets.images.googleWord.letter2.dimmed.keyName, + Assets.images.googleWord.letter3.lit.keyName, + Assets.images.googleWord.letter3.dimmed.keyName, + Assets.images.googleWord.letter4.lit.keyName, + Assets.images.googleWord.letter4.dimmed.keyName, + Assets.images.googleWord.letter5.lit.keyName, + Assets.images.googleWord.letter5.dimmed.keyName, + Assets.images.googleWord.letter6.lit.keyName, + Assets.images.googleWord.letter6.dimmed.keyName, ]; group('GoogleWordBonusBehaviors', () { diff --git a/test/game/components/google_word/google_word_test.dart b/test/game/components/google_word/google_word_test.dart index 81c3431e..11751238 100644 --- a/test/game/components/google_word/google_word_test.dart +++ b/test/game/components/google_word/google_word_test.dart @@ -12,18 +12,18 @@ import '../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.googleWord.letter1.active.keyName, - Assets.images.googleWord.letter1.inactive.keyName, - Assets.images.googleWord.letter2.active.keyName, - Assets.images.googleWord.letter2.inactive.keyName, - Assets.images.googleWord.letter3.active.keyName, - Assets.images.googleWord.letter3.inactive.keyName, - Assets.images.googleWord.letter4.active.keyName, - Assets.images.googleWord.letter4.inactive.keyName, - Assets.images.googleWord.letter5.active.keyName, - Assets.images.googleWord.letter5.inactive.keyName, - Assets.images.googleWord.letter6.active.keyName, - Assets.images.googleWord.letter6.inactive.keyName, + Assets.images.googleWord.letter1.lit.keyName, + Assets.images.googleWord.letter1.dimmed.keyName, + Assets.images.googleWord.letter2.lit.keyName, + Assets.images.googleWord.letter2.dimmed.keyName, + Assets.images.googleWord.letter3.lit.keyName, + Assets.images.googleWord.letter3.dimmed.keyName, + Assets.images.googleWord.letter4.lit.keyName, + Assets.images.googleWord.letter4.dimmed.keyName, + Assets.images.googleWord.letter5.lit.keyName, + Assets.images.googleWord.letter5.dimmed.keyName, + Assets.images.googleWord.letter6.lit.keyName, + Assets.images.googleWord.letter6.dimmed.keyName, ]; final flameTester = FlameTester(() => EmptyPinballTestGame(assets: assets)); diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 5c70696a..c2357046 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -45,18 +45,18 @@ void main() { Assets.images.dash.bumper.main.inactive.keyName, Assets.images.flipper.left.keyName, Assets.images.flipper.right.keyName, - Assets.images.googleWord.letter1.active.keyName, - Assets.images.googleWord.letter1.inactive.keyName, - Assets.images.googleWord.letter2.active.keyName, - Assets.images.googleWord.letter2.inactive.keyName, - Assets.images.googleWord.letter3.active.keyName, - Assets.images.googleWord.letter3.inactive.keyName, - Assets.images.googleWord.letter4.active.keyName, - Assets.images.googleWord.letter4.inactive.keyName, - Assets.images.googleWord.letter5.active.keyName, - Assets.images.googleWord.letter5.inactive.keyName, - Assets.images.googleWord.letter6.active.keyName, - Assets.images.googleWord.letter6.inactive.keyName, + Assets.images.googleWord.letter1.lit.keyName, + Assets.images.googleWord.letter1.dimmed.keyName, + Assets.images.googleWord.letter2.lit.keyName, + Assets.images.googleWord.letter2.dimmed.keyName, + Assets.images.googleWord.letter3.lit.keyName, + Assets.images.googleWord.letter3.dimmed.keyName, + Assets.images.googleWord.letter4.lit.keyName, + Assets.images.googleWord.letter4.dimmed.keyName, + Assets.images.googleWord.letter5.lit.keyName, + Assets.images.googleWord.letter5.dimmed.keyName, + Assets.images.googleWord.letter6.lit.keyName, + Assets.images.googleWord.letter6.dimmed.keyName, Assets.images.kicker.left.lit.keyName, Assets.images.kicker.left.dimmed.keyName, Assets.images.kicker.right.lit.keyName,