From 336ebfe2e0e50aab0f1e2cf5dd46a5b288738d85 Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Fri, 6 May 2022 13:22:41 -0300 Subject: [PATCH] pr suggestions --- .../lib/src/components/error_component.dart | 31 +++++++++++-------- .../error_component/error_component_game.dart | 2 +- .../src/components/error_component_test.dart | 6 ++-- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/packages/pinball_components/lib/src/components/error_component.dart b/packages/pinball_components/lib/src/components/error_component.dart index e339e179..bf11b9f8 100644 --- a/packages/pinball_components/lib/src/components/error_component.dart +++ b/packages/pinball_components/lib/src/components/error_component.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_ui/pinball_ui.dart'; -final _labelStrongTextPaint = TextPaint( +final _boldLabelTextPaint = TextPaint( style: const TextStyle( fontSize: 1.8, color: PinballColors.white, @@ -33,8 +33,8 @@ class ErrorComponent extends SpriteComponent with HasGameRef { ); /// {@macro error_component} - ErrorComponent.strong({required this.label, Vector2? position}) - : _textPaint = _labelStrongTextPaint, + ErrorComponent.bold({required this.label, Vector2? position}) + : _textPaint = _boldLabelTextPaint, super( position: position, ); @@ -43,16 +43,7 @@ class ErrorComponent extends SpriteComponent with HasGameRef { final String label; final TextPaint _textPaint; - @override - Future onLoad() async { - anchor = Anchor.center; - final sprite = await gameRef.loadSprite( - Assets.images.errorBackground.keyName, - ); - - size = sprite.originalSize / 20; - this.sprite = sprite; - + List _splitInLines() { final maxWidth = size.x - 8; final lines = []; var currentLine = ''; @@ -69,6 +60,20 @@ class ErrorComponent extends SpriteComponent with HasGameRef { } lines.add(currentLine); + return lines; + } + + @override + Future onLoad() async { + anchor = Anchor.center; + final sprite = await gameRef.loadSprite( + Assets.images.errorBackground.keyName, + ); + + size = sprite.originalSize / 20; + this.sprite = sprite; + + final lines = _splitInLines(); /// Based on how many lines we have, their size and a small /// offset due to the centering, this calculates where the lines diff --git a/packages/pinball_components/sandbox/lib/stories/error_component/error_component_game.dart b/packages/pinball_components/sandbox/lib/stories/error_component/error_component_game.dart index 091c4fdc..a39e598e 100644 --- a/packages/pinball_components/sandbox/lib/stories/error_component/error_component_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/error_component/error_component_game.dart @@ -16,7 +16,7 @@ class ErrorComponentGame extends AssetsGame { await add(ErrorComponent(label: text)); await add( - ErrorComponent.strong( + ErrorComponent.bold( label: text, position: Vector2(0, 10), ), diff --git a/packages/pinball_components/test/src/components/error_component_test.dart b/packages/pinball_components/test/src/components/error_component_test.dart index 72319517..c50ac629 100644 --- a/packages/pinball_components/test/src/components/error_component_test.dart +++ b/packages/pinball_components/test/src/components/error_component_test.dart @@ -7,7 +7,7 @@ import 'package:pinball_components/pinball_components.dart'; import '../../helpers/helpers.dart'; -extension IterableX on Iterable { +extension _IterableX on Iterable { int countTexts(String value) { return where( (component) => component is TextComponent && component.text == value, @@ -45,9 +45,9 @@ void main() { }); }); - group('when using the stronger font', () { + group('when using the bold font', () { flameTester.test('renders correctly', (game) async { - await game.ensureAdd(ErrorComponent.strong(label: 'Error Message')); + await game.ensureAdd(ErrorComponent.bold(label: 'Error Message')); final count = game.descendants().countTexts('Error Message'); expect(count, equals(1));