diff --git a/lib/gen/gen.dart b/lib/gen/gen.dart new file mode 100644 index 00000000..e7ad4c54 --- /dev/null +++ b/lib/gen/gen.dart @@ -0,0 +1 @@ +export 'assets.gen.dart'; diff --git a/lib/theme/app_colors.dart b/lib/theme/app_colors.dart new file mode 100644 index 00000000..2d3899a6 --- /dev/null +++ b/lib/theme/app_colors.dart @@ -0,0 +1,15 @@ +// ignore_for_file: public_member_api_docs + +import 'package:flutter/material.dart'; + +abstract class AppColors { + static const Color white = Color(0xFFFFFFFF); + + static const Color darkBlue = Color(0xFF0C32A4); + + static const Color orange = Color(0xFFFFEE02); + + static const Color blue = Color(0xFF4B94F6); + + static const Color transparent = Color(0x00000000); +} diff --git a/lib/theme/app_text_style.dart b/lib/theme/app_text_style.dart new file mode 100644 index 00000000..068f1eb9 --- /dev/null +++ b/lib/theme/app_text_style.dart @@ -0,0 +1,35 @@ +// ignore_for_file: public_member_api_docs + +import 'package:flutter/widgets.dart'; +import 'package:pinball/theme/theme.dart'; +import 'package:pinball_components/pinball_components.dart'; + +const _fontPackage = 'pinball_components'; +const _primaryFontFamily = PinballFonts.pixeloidSans; + +abstract class AppTextStyle { + static const headline1 = TextStyle( + fontSize: 28, + package: _fontPackage, + fontFamily: _primaryFontFamily, + ); + + static const headline2 = TextStyle( + fontSize: 24, + package: _fontPackage, + fontFamily: _primaryFontFamily, + ); + + static const headline3 = TextStyle( + color: AppColors.white, + fontSize: 20, + package: _fontPackage, + fontFamily: _primaryFontFamily, + ); + + static const subtitle1 = TextStyle( + fontSize: 10, + fontFamily: _primaryFontFamily, + package: _fontPackage, + ); +} diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart index f6318400..5e4fefe9 100644 --- a/lib/theme/theme.dart +++ b/lib/theme/theme.dart @@ -1,2 +1,4 @@ +export 'app_colors.dart'; +export 'app_text_style.dart'; export 'cubit/theme_cubit.dart'; export 'view/view.dart'; diff --git a/packages/pinball_components/lib/gen/gen.dart b/packages/pinball_components/lib/gen/gen.dart new file mode 100644 index 00000000..0171b231 --- /dev/null +++ b/packages/pinball_components/lib/gen/gen.dart @@ -0,0 +1,2 @@ +export 'assets.gen.dart'; +export 'pinball_fonts.dart'; diff --git a/packages/pinball_components/lib/gen/pinball_fonts.dart b/packages/pinball_components/lib/gen/pinball_fonts.dart index c1b3c6fa..59dcaa6e 100644 --- a/packages/pinball_components/lib/gen/pinball_fonts.dart +++ b/packages/pinball_components/lib/gen/pinball_fonts.dart @@ -1,16 +1,14 @@ import 'package:pinball_components/gen/fonts.gen.dart'; -String _prefixFont(String font) { - return 'packages/pinball_components/$font'; -} +const String _fontPath = 'packages/pinball_components/'; /// Class with the fonts available on the pinball game class PinballFonts { PinballFonts._(); /// Mono variation of the Pixeloid font - static final String pixeloidMono = _prefixFont(FontFamily.pixeloidMono); + static const String pixeloidMono = '$_fontPath/${FontFamily.pixeloidMono}'; /// Sans variation of the Pixeloid font - static final String pixeloidSans = _prefixFont(FontFamily.pixeloidMono); + static const String pixeloidSans = '$_fontPath/${FontFamily.pixeloidSans}'; } diff --git a/packages/pinball_components/lib/pinball_components.dart b/packages/pinball_components/lib/pinball_components.dart index 2551b54e..cf394b0e 100644 --- a/packages/pinball_components/lib/pinball_components.dart +++ b/packages/pinball_components/lib/pinball_components.dart @@ -1,5 +1,4 @@ library pinball_components; -export 'gen/assets.gen.dart'; -export 'gen/pinball_fonts.dart'; +export 'gen/gen.dart'; export 'src/pinball_components.dart'; diff --git a/packages/pinball_components/lib/src/components/backboard/backboard.dart b/packages/pinball_components/lib/src/components/backboard/backboard.dart index c5c4ac17..dc3cacb3 100644 --- a/packages/pinball_components/lib/src/components/backboard/backboard.dart +++ b/packages/pinball_components/lib/src/components/backboard/backboard.dart @@ -46,7 +46,7 @@ class Backboard extends PositionComponent with HasGameRef { /// [TextPaint] used on the [Backboard] static final textPaint = TextPaint( - style: TextStyle( + style: const TextStyle( fontSize: 6, color: Colors.white, fontFamily: PinballFonts.pixeloidSans,