From 28606241df97cec7ad8708e84f679a09e42ea1c7 Mon Sep 17 00:00:00 2001 From: arturplaczek <33895544+arturplaczek@users.noreply.github.com> Date: Thu, 5 May 2022 20:21:58 +0200 Subject: [PATCH] fix: update fonts size on game hud (#347) --- lib/game/view/widgets/score_view.dart | 32 +++++++++---------- .../lib/src/theme/pinball_text_style.dart | 2 +- .../src/theme/pinball_text_style_test.dart | 4 +-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/game/view/widgets/score_view.dart b/lib/game/view/widgets/score_view.dart index 66233598..4c0c3f46 100644 --- a/lib/game/view/widgets/score_view.dart +++ b/lib/game/view/widgets/score_view.dart @@ -50,17 +50,19 @@ class _ScoreDisplay extends StatelessWidget { Widget build(BuildContext context) { final l10n = context.l10n; - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Text( - l10n.score.toLowerCase(), - style: Theme.of(context).textTheme.subtitle1, - ), - const _ScoreText(), - const RoundCountDisplay(), - ], + return FittedBox( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + l10n.score.toLowerCase(), + style: Theme.of(context).textTheme.subtitle1, + ), + const _ScoreText(), + const RoundCountDisplay(), + ], + ), ); } } @@ -72,11 +74,9 @@ class _ScoreText extends StatelessWidget { Widget build(BuildContext context) { final score = context.select((GameBloc bloc) => bloc.state.displayScore); - return FittedBox( - child: Text( - score.formatScore(), - style: Theme.of(context).textTheme.headline2, - ), + return Text( + score.formatScore(), + style: Theme.of(context).textTheme.headline1, ); } } diff --git a/packages/pinball_ui/lib/src/theme/pinball_text_style.dart b/packages/pinball_ui/lib/src/theme/pinball_text_style.dart index 5e0a7fa2..10383abf 100644 --- a/packages/pinball_ui/lib/src/theme/pinball_text_style.dart +++ b/packages/pinball_ui/lib/src/theme/pinball_text_style.dart @@ -45,7 +45,7 @@ abstract class PinballTextStyle { ); static const subtitle1 = TextStyle( - fontSize: 10, + fontSize: 12, fontFamily: _primaryFontFamily, package: _fontPackage, color: PinballColors.yellow, diff --git a/packages/pinball_ui/test/src/theme/pinball_text_style_test.dart b/packages/pinball_ui/test/src/theme/pinball_text_style_test.dart index 2af092b2..72cd66a6 100644 --- a/packages/pinball_ui/test/src/theme/pinball_text_style_test.dart +++ b/packages/pinball_ui/test/src/theme/pinball_text_style_test.dart @@ -26,9 +26,9 @@ void main() { expect(style.color, PinballColors.white); }); - test('subtitle1 has fontSize 10 and yellow color', () { + test('subtitle1 has fontSize 12 and yellow color', () { const style = PinballTextStyle.subtitle1; - expect(style.fontSize, 10); + expect(style.fontSize, 12); expect(style.color, PinballColors.yellow); });