From f00d31383fa11ac2c0f452b439c7e9adc71822b0 Mon Sep 17 00:00:00 2001 From: RuiAlonso Date: Mon, 2 May 2022 11:29:17 +0200 Subject: [PATCH] refactor: removing baseColor from ball --- packages/pinball_components/lib/src/components/ball.dart | 5 +---- .../sandbox/lib/stories/ball/basic_ball_game.dart | 4 +--- .../pinball_components/sandbox/lib/stories/ball/stories.dart | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/pinball_components/lib/src/components/ball.dart b/packages/pinball_components/lib/src/components/ball.dart index a2806daf..6f9abc34 100644 --- a/packages/pinball_components/lib/src/components/ball.dart +++ b/packages/pinball_components/lib/src/components/ball.dart @@ -14,7 +14,7 @@ class Ball extends BodyComponent with Layered, InitialPosition { /// {@macro ball} Ball({ - required this.baseColor, + Color? baseColor, String? spriteAsset, }) : super( renderBody: false, @@ -33,9 +33,6 @@ class Ball extends BodyComponent /// The size of the [Ball]. static final Vector2 size = Vector2.all(4.13); - /// The base [Color] used to tint this [Ball]. - final Color baseColor; - @override Body createBody() { final shape = CircleShape()..radius = size.x / 2; diff --git a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart index 9009d323..a0cf38b5 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart @@ -5,7 +5,7 @@ import 'package:sandbox/common/common.dart'; class BallGame extends AssetsGame with TapDetector, Traceable { BallGame({ - this.color = Colors.blue, + Color? color, this.ballPriority = 0, this.ballLayer = Layer.all, this.character, @@ -34,7 +34,6 @@ class BallGame extends AssetsGame with TapDetector, Traceable { 'Dino': Assets.images.ball.dinoBall.keyName, }; - final Color color; final int ballPriority; final Layer ballLayer; final String? character; @@ -43,7 +42,6 @@ class BallGame extends AssetsGame with TapDetector, Traceable { void onTapUp(TapUpInfo info) { add( Ball( - baseColor: color, spriteAsset: characterBallPaths[character], ) ..initialPosition = info.eventPosition.game diff --git a/packages/pinball_components/sandbox/lib/stories/ball/stories.dart b/packages/pinball_components/sandbox/lib/stories/ball/stories.dart index dd757fcd..146ebcda 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/stories.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/stories.dart @@ -1,5 +1,4 @@ import 'package:dashbook/dashbook.dart'; -import 'package:flutter/material.dart'; import 'package:sandbox/common/common.dart'; import 'package:sandbox/stories/ball/ball_booster_game.dart'; import 'package:sandbox/stories/ball/basic_ball_game.dart'; @@ -7,10 +6,9 @@ import 'package:sandbox/stories/ball/basic_ball_game.dart'; void addBallStories(Dashbook dashbook) { dashbook.storiesOf('Ball') ..addGame( - title: 'Colored', + title: 'Themed', description: BallGame.description, gameBuilder: (context) => BallGame( - color: context.colorProperty('color', Colors.blue), character: context.listProperty( 'Character', BallGame.characterBallPaths.keys.first,