From 4b940e4f8a24b5d13ff69496588ec84fe89669ea Mon Sep 17 00:00:00 2001 From: Erick Zanardo Date: Thu, 5 May 2022 12:18:34 -0300 Subject: [PATCH] pr suggestions --- .../components/backbox/displays/loading_display.dart | 7 ++----- .../backbox/displays/loading_display_test.dart | 10 +++++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/game/components/backbox/displays/loading_display.dart b/lib/game/components/backbox/displays/loading_display.dart index 6d5e786f..7b1d4280 100644 --- a/lib/game/components/backbox/displays/loading_display.dart +++ b/lib/game/components/backbox/displays/loading_display.dart @@ -1,7 +1,6 @@ import 'package:flame/components.dart'; import 'package:flutter/material.dart'; import 'package:pinball/game/game.dart'; -import 'package:pinball/l10n/l10n.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_ui/pinball_ui.dart'; @@ -18,9 +17,7 @@ final _bodyTextPaint = TextPaint( /// {@endtemplate} class LoadingDisplay extends TextComponent with HasGameRef { /// {@template loading_display} - LoadingDisplay({AppLocalizations? l10n}) : _l10n = l10n; - - final AppLocalizations? _l10n; + LoadingDisplay(); late final String _label; @@ -30,7 +27,7 @@ class LoadingDisplay extends TextComponent with HasGameRef { position = Vector2(0, -10); anchor = Anchor.center; - text = _label = (_l10n ?? gameRef.l10n).loading; + text = _label = gameRef.l10n.loading; textRenderer = _bodyTextPaint; await add( diff --git a/test/game/components/backbox/displays/loading_display_test.dart b/test/game/components/backbox/displays/loading_display_test.dart index d636b233..a09d0d68 100644 --- a/test/game/components/backbox/displays/loading_display_test.dart +++ b/test/game/components/backbox/displays/loading_display_test.dart @@ -16,10 +16,14 @@ class _MockAppLocalizations extends Mock implements AppLocalizations { void main() { group('LoadingDisplay', () { - final flameTester = FlameTester(EmptyKeyboardPinballTestGame.new); + final flameTester = FlameTester( + () => EmptyPinballTestGame( + l10n: _MockAppLocalizations(), + ), + ); flameTester.test('renders correctly', (game) async { - await game.ensureAdd(LoadingDisplay(l10n: _MockAppLocalizations())); + await game.ensureAdd(LoadingDisplay()); final component = game.firstChild(); expect(component, isNotNull); @@ -27,7 +31,7 @@ void main() { }); flameTester.test('use ellipses as animation', (game) async { - await game.ensureAdd(LoadingDisplay(l10n: _MockAppLocalizations())); + await game.ensureAdd(LoadingDisplay()); final component = game.firstChild(); expect(component?.text, equals('Loading'));