From 24361d984af272709125f9cf23a8e8de91667cda Mon Sep 17 00:00:00 2001 From: RuiAlonso Date: Thu, 28 Apr 2022 11:04:26 +0200 Subject: [PATCH] refactor: changed properties names --- .../lib/src/components/multiplier.dart | 38 +++++++++---------- .../test/src/components/multiplier_test.dart | 30 +++++++-------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/pinball_components/lib/src/components/multiplier.dart b/packages/pinball_components/lib/src/components/multiplier.dart index 4aab2936..04bde651 100644 --- a/packages/pinball_components/lib/src/components/multiplier.dart +++ b/packages/pinball_components/lib/src/components/multiplier.dart @@ -16,8 +16,8 @@ class Multiplier extends Component { }) : _value = value, _sprite = MultiplierSpriteGroupComponent( position: position, - onAssetPath: value.onAssetPath, - offAssetPath: value.offAssetPath, + litAssetPath: value.litAssetPath, + dimmedAssetPath: value.dimmedAssetPath, rotation: rotation, ); @@ -28,9 +28,9 @@ class Multiplier extends Component { /// multiplier. void toggle(int multiplier) { if (_value.equalsTo(multiplier)) { - _sprite.current = MultiplierSpriteState.active; + _sprite.current = MultiplierSpriteState.lit; } else { - _sprite.current = MultiplierSpriteState.inactive; + _sprite.current = MultiplierSpriteState.dimmed; } } @@ -53,14 +53,14 @@ enum MultiplierValue { /// Indicates the current sprite state of the multiplier. enum MultiplierSpriteState { /// A lit up bumper. - active, + lit, /// A dimmed bumper. - inactive, + dimmed, } extension on MultiplierValue { - String get onAssetPath { + String get litAssetPath { switch (this) { case MultiplierValue.x2: return Assets.images.multiplier.x2.lit.keyName; @@ -75,7 +75,7 @@ extension on MultiplierValue { } } - String get offAssetPath { + String get dimmedAssetPath { switch (this) { case MultiplierValue.x2: return Assets.images.multiplier.x2.dimmed.keyName; @@ -115,33 +115,33 @@ class MultiplierSpriteGroupComponent /// {@macro multiplier_sprite_group_component} MultiplierSpriteGroupComponent({ required Vector2 position, - required String onAssetPath, - required String offAssetPath, + required String litAssetPath, + required String dimmedAssetPath, required double rotation, - }) : _onAssetPath = onAssetPath, - _offAssetPath = offAssetPath, + }) : _litAssetPath = litAssetPath, + _dimmedAssetPath = dimmedAssetPath, super( anchor: Anchor.center, position: position, angle: rotation, ); - final String _onAssetPath; - final String _offAssetPath; + final String _litAssetPath; + final String _dimmedAssetPath; @override Future onLoad() async { await super.onLoad(); final sprites = { - MultiplierSpriteState.active: - Sprite(gameRef.images.fromCache(_onAssetPath)), - MultiplierSpriteState.inactive: - Sprite(gameRef.images.fromCache(_offAssetPath)), + MultiplierSpriteState.lit: + Sprite(gameRef.images.fromCache(_litAssetPath)), + MultiplierSpriteState.dimmed: + Sprite(gameRef.images.fromCache(_dimmedAssetPath)), }; this.sprites = sprites; - current = MultiplierSpriteState.inactive; + current = MultiplierSpriteState.dimmed; size = sprites[current]!.originalSize / 10; } } diff --git a/packages/pinball_components/test/src/components/multiplier_test.dart b/packages/pinball_components/test/src/components/multiplier_test.dart index 6895b5cd..1f508fad 100644 --- a/packages/pinball_components/test/src/components/multiplier_test.dart +++ b/packages/pinball_components/test/src/components/multiplier_test.dart @@ -47,7 +47,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.active, + MultiplierSpriteState.lit, ); await expectLater( @@ -78,7 +78,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); await expectLater( @@ -110,7 +110,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); }, ); @@ -138,7 +138,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.active, + MultiplierSpriteState.lit, ); await expectLater( @@ -169,7 +169,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); await expectLater( @@ -201,7 +201,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); }, ); @@ -229,7 +229,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.active, + MultiplierSpriteState.lit, ); await expectLater( @@ -260,7 +260,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); await expectLater( @@ -292,7 +292,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); }, ); @@ -320,7 +320,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.active, + MultiplierSpriteState.lit, ); await expectLater( @@ -351,7 +351,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); await expectLater( @@ -383,7 +383,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); }, ); @@ -411,7 +411,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.active, + MultiplierSpriteState.lit, ); await expectLater( @@ -442,7 +442,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); await expectLater( @@ -474,7 +474,7 @@ void main() { .whereType() .first .current, - MultiplierSpriteState.inactive, + MultiplierSpriteState.dimmed, ); }, );