diff --git a/packages/pinball_theme/assets/images/android/character.png b/packages/pinball_theme/assets/images/android/character.png deleted file mode 100644 index 736f1e6f..00000000 Binary files a/packages/pinball_theme/assets/images/android/character.png and /dev/null differ diff --git a/packages/pinball_theme/assets/images/dash/character.png b/packages/pinball_theme/assets/images/dash/character.png deleted file mode 100644 index d76795aa..00000000 Binary files a/packages/pinball_theme/assets/images/dash/character.png and /dev/null differ diff --git a/packages/pinball_theme/assets/images/dino/character.png b/packages/pinball_theme/assets/images/dino/character.png deleted file mode 100644 index c6f5a390..00000000 Binary files a/packages/pinball_theme/assets/images/dino/character.png and /dev/null differ diff --git a/packages/pinball_theme/assets/images/sparky/character.png b/packages/pinball_theme/assets/images/sparky/character.png deleted file mode 100644 index c37403b3..00000000 Binary files a/packages/pinball_theme/assets/images/sparky/character.png and /dev/null differ diff --git a/packages/pinball_theme/lib/src/themes/android_theme.dart b/packages/pinball_theme/lib/src/themes/android_theme.dart index 4c78684a..8989c717 100644 --- a/packages/pinball_theme/lib/src/themes/android_theme.dart +++ b/packages/pinball_theme/lib/src/themes/android_theme.dart @@ -14,9 +14,6 @@ class AndroidTheme extends CharacterTheme { @override Color get ballColor => Colors.green; - @override - AssetGenImage get character => Assets.images.android.character; - @override AssetGenImage get background => Assets.images.android.background; @@ -27,5 +24,5 @@ class AndroidTheme extends CharacterTheme { AssetGenImage get leaderboardIcon => Assets.images.android.leaderboardIcon; @override - String get animationPath => Assets.images.android.animation.keyName; + AssetGenImage get animation => Assets.images.android.animation; } diff --git a/packages/pinball_theme/lib/src/themes/character_theme.dart b/packages/pinball_theme/lib/src/themes/character_theme.dart index 53a56941..bfb8987c 100644 --- a/packages/pinball_theme/lib/src/themes/character_theme.dart +++ b/packages/pinball_theme/lib/src/themes/character_theme.dart @@ -18,9 +18,6 @@ abstract class CharacterTheme extends Equatable { /// Ball color for this theme. Color get ballColor; - /// Asset for the theme character. - AssetGenImage get character; - /// Asset for the background. AssetGenImage get background; @@ -30,16 +27,16 @@ abstract class CharacterTheme extends Equatable { /// Icon asset for the leaderboard. AssetGenImage get leaderboardIcon; - /// Path to the asset for the animation. - String get animationPath; + /// Icon asset for the the animation. + AssetGenImage get animation; @override List get props => [ name, ballColor, - character, background, icon, leaderboardIcon, + animation, ]; } diff --git a/packages/pinball_theme/lib/src/themes/dash_theme.dart b/packages/pinball_theme/lib/src/themes/dash_theme.dart index 7f70a56a..7584c8ed 100644 --- a/packages/pinball_theme/lib/src/themes/dash_theme.dart +++ b/packages/pinball_theme/lib/src/themes/dash_theme.dart @@ -14,9 +14,6 @@ class DashTheme extends CharacterTheme { @override Color get ballColor => Colors.blue; - @override - AssetGenImage get character => Assets.images.dash.character; - @override AssetGenImage get background => Assets.images.dash.background; @@ -27,5 +24,5 @@ class DashTheme extends CharacterTheme { AssetGenImage get leaderboardIcon => Assets.images.dash.leaderboardIcon; @override - String get animationPath => Assets.images.dash.animation.keyName; + AssetGenImage get animation => Assets.images.dash.animation; } diff --git a/packages/pinball_theme/lib/src/themes/dino_theme.dart b/packages/pinball_theme/lib/src/themes/dino_theme.dart index 7e2b3580..3baf466c 100644 --- a/packages/pinball_theme/lib/src/themes/dino_theme.dart +++ b/packages/pinball_theme/lib/src/themes/dino_theme.dart @@ -14,9 +14,6 @@ class DinoTheme extends CharacterTheme { @override Color get ballColor => Colors.grey; - @override - AssetGenImage get character => Assets.images.dino.character; - @override AssetGenImage get background => Assets.images.dino.background; @@ -27,5 +24,5 @@ class DinoTheme extends CharacterTheme { AssetGenImage get leaderboardIcon => Assets.images.dino.leaderboardIcon; @override - String get animationPath => Assets.images.dino.animation.keyName; + AssetGenImage get animation => Assets.images.dino.animation; } diff --git a/packages/pinball_theme/lib/src/themes/sparky_theme.dart b/packages/pinball_theme/lib/src/themes/sparky_theme.dart index e760134f..7884a22f 100644 --- a/packages/pinball_theme/lib/src/themes/sparky_theme.dart +++ b/packages/pinball_theme/lib/src/themes/sparky_theme.dart @@ -14,9 +14,6 @@ class SparkyTheme extends CharacterTheme { @override String get name => 'Sparky'; - @override - AssetGenImage get character => Assets.images.sparky.character; - @override AssetGenImage get background => Assets.images.sparky.background; @@ -27,5 +24,5 @@ class SparkyTheme extends CharacterTheme { AssetGenImage get leaderboardIcon => Assets.images.sparky.leaderboardIcon; @override - String get animationPath => Assets.images.sparky.animation.keyName; + AssetGenImage get animation => Assets.images.sparky.animation; } diff --git a/packages/pinball_theme/test/src/themes/android_theme_test.dart b/packages/pinball_theme/test/src/themes/android_theme_test.dart index f24f3bc1..27a06922 100644 --- a/packages/pinball_theme/test/src/themes/android_theme_test.dart +++ b/packages/pinball_theme/test/src/themes/android_theme_test.dart @@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart'; void main() { group('AndroidTheme', () { test('can be instantiated', () { - final androidTheme = AndroidTheme(); - - expect(androidTheme, isNotNull); - expect(androidTheme.animationPath, isNotNull); + expect(AndroidTheme(), isNotNull); }); test('supports value equality', () { diff --git a/packages/pinball_theme/test/src/themes/dash_theme_test.dart b/packages/pinball_theme/test/src/themes/dash_theme_test.dart index cf5fc4c8..16605fb3 100644 --- a/packages/pinball_theme/test/src/themes/dash_theme_test.dart +++ b/packages/pinball_theme/test/src/themes/dash_theme_test.dart @@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart'; void main() { group('DashTheme', () { test('can be instantiated', () { - final dashTheme = DashTheme(); - - expect(dashTheme, isNotNull); - expect(dashTheme.animationPath, isNotNull); + expect(DashTheme(), isNotNull); }); test('supports value equality', () { diff --git a/packages/pinball_theme/test/src/themes/dino_theme_test.dart b/packages/pinball_theme/test/src/themes/dino_theme_test.dart index 87d52172..45ea0813 100644 --- a/packages/pinball_theme/test/src/themes/dino_theme_test.dart +++ b/packages/pinball_theme/test/src/themes/dino_theme_test.dart @@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart'; void main() { group('DinoTheme', () { test('can be instantiated', () { - final dinoTheme = DinoTheme(); - - expect(dinoTheme, isNotNull); - expect(dinoTheme.animationPath, isNotNull); + expect(DinoTheme(), isNotNull); }); test('supports value equality', () { diff --git a/packages/pinball_theme/test/src/themes/sparky_theme_test.dart b/packages/pinball_theme/test/src/themes/sparky_theme_test.dart index f15d43e4..ce276938 100644 --- a/packages/pinball_theme/test/src/themes/sparky_theme_test.dart +++ b/packages/pinball_theme/test/src/themes/sparky_theme_test.dart @@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart'; void main() { group('SparkyTheme', () { test('can be instantiated', () { - final sparkyTheme = SparkyTheme(); - - expect(sparkyTheme, isNotNull); - expect(sparkyTheme.animationPath, isNotNull); + expect(SparkyTheme(), isNotNull); }); test('supports value equality', () {