fix: apply code review

pull/223/head
arturplaczek 3 years ago
parent ccec15fa94
commit 34a5220467

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

@ -14,9 +14,6 @@ class AndroidTheme extends CharacterTheme {
@override @override
Color get ballColor => Colors.green; Color get ballColor => Colors.green;
@override
AssetGenImage get character => Assets.images.android.character;
@override @override
AssetGenImage get background => Assets.images.android.background; AssetGenImage get background => Assets.images.android.background;
@ -27,5 +24,5 @@ class AndroidTheme extends CharacterTheme {
AssetGenImage get leaderboardIcon => Assets.images.android.leaderboardIcon; AssetGenImage get leaderboardIcon => Assets.images.android.leaderboardIcon;
@override @override
String get animationPath => Assets.images.android.animation.keyName; AssetGenImage get animation => Assets.images.android.animation;
} }

@ -18,9 +18,6 @@ abstract class CharacterTheme extends Equatable {
/// Ball color for this theme. /// Ball color for this theme.
Color get ballColor; Color get ballColor;
/// Asset for the theme character.
AssetGenImage get character;
/// Asset for the background. /// Asset for the background.
AssetGenImage get background; AssetGenImage get background;
@ -30,16 +27,16 @@ abstract class CharacterTheme extends Equatable {
/// Icon asset for the leaderboard. /// Icon asset for the leaderboard.
AssetGenImage get leaderboardIcon; AssetGenImage get leaderboardIcon;
/// Path to the asset for the animation. /// Icon asset for the the animation.
String get animationPath; AssetGenImage get animation;
@override @override
List<Object?> get props => [ List<Object?> get props => [
name, name,
ballColor, ballColor,
character,
background, background,
icon, icon,
leaderboardIcon, leaderboardIcon,
animation,
]; ];
} }

@ -14,9 +14,6 @@ class DashTheme extends CharacterTheme {
@override @override
Color get ballColor => Colors.blue; Color get ballColor => Colors.blue;
@override
AssetGenImage get character => Assets.images.dash.character;
@override @override
AssetGenImage get background => Assets.images.dash.background; AssetGenImage get background => Assets.images.dash.background;
@ -27,5 +24,5 @@ class DashTheme extends CharacterTheme {
AssetGenImage get leaderboardIcon => Assets.images.dash.leaderboardIcon; AssetGenImage get leaderboardIcon => Assets.images.dash.leaderboardIcon;
@override @override
String get animationPath => Assets.images.dash.animation.keyName; AssetGenImage get animation => Assets.images.dash.animation;
} }

@ -14,9 +14,6 @@ class DinoTheme extends CharacterTheme {
@override @override
Color get ballColor => Colors.grey; Color get ballColor => Colors.grey;
@override
AssetGenImage get character => Assets.images.dino.character;
@override @override
AssetGenImage get background => Assets.images.dino.background; AssetGenImage get background => Assets.images.dino.background;
@ -27,5 +24,5 @@ class DinoTheme extends CharacterTheme {
AssetGenImage get leaderboardIcon => Assets.images.dino.leaderboardIcon; AssetGenImage get leaderboardIcon => Assets.images.dino.leaderboardIcon;
@override @override
String get animationPath => Assets.images.dino.animation.keyName; AssetGenImage get animation => Assets.images.dino.animation;
} }

@ -14,9 +14,6 @@ class SparkyTheme extends CharacterTheme {
@override @override
String get name => 'Sparky'; String get name => 'Sparky';
@override
AssetGenImage get character => Assets.images.sparky.character;
@override @override
AssetGenImage get background => Assets.images.sparky.background; AssetGenImage get background => Assets.images.sparky.background;
@ -27,5 +24,5 @@ class SparkyTheme extends CharacterTheme {
AssetGenImage get leaderboardIcon => Assets.images.sparky.leaderboardIcon; AssetGenImage get leaderboardIcon => Assets.images.sparky.leaderboardIcon;
@override @override
String get animationPath => Assets.images.sparky.animation.keyName; AssetGenImage get animation => Assets.images.sparky.animation;
} }

@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart';
void main() { void main() {
group('AndroidTheme', () { group('AndroidTheme', () {
test('can be instantiated', () { test('can be instantiated', () {
final androidTheme = AndroidTheme(); expect(AndroidTheme(), isNotNull);
expect(androidTheme, isNotNull);
expect(androidTheme.animationPath, isNotNull);
}); });
test('supports value equality', () { test('supports value equality', () {

@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart';
void main() { void main() {
group('DashTheme', () { group('DashTheme', () {
test('can be instantiated', () { test('can be instantiated', () {
final dashTheme = DashTheme(); expect(DashTheme(), isNotNull);
expect(dashTheme, isNotNull);
expect(dashTheme.animationPath, isNotNull);
}); });
test('supports value equality', () { test('supports value equality', () {

@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart';
void main() { void main() {
group('DinoTheme', () { group('DinoTheme', () {
test('can be instantiated', () { test('can be instantiated', () {
final dinoTheme = DinoTheme(); expect(DinoTheme(), isNotNull);
expect(dinoTheme, isNotNull);
expect(dinoTheme.animationPath, isNotNull);
}); });
test('supports value equality', () { test('supports value equality', () {

@ -6,10 +6,7 @@ import 'package:pinball_theme/pinball_theme.dart';
void main() { void main() {
group('SparkyTheme', () { group('SparkyTheme', () {
test('can be instantiated', () { test('can be instantiated', () {
final sparkyTheme = SparkyTheme(); expect(SparkyTheme(), isNotNull);
expect(sparkyTheme, isNotNull);
expect(sparkyTheme.animationPath, isNotNull);
}); });
test('supports value equality', () { test('supports value equality', () {

Loading…
Cancel
Save