diff --git a/assets/fonts/Poppins-Black.ttf b/assets/fonts/Poppins-Black.ttf new file mode 100644 index 0000000..71c0f99 Binary files /dev/null and b/assets/fonts/Poppins-Black.ttf differ diff --git a/assets/fonts/Poppins-BlackItalic.ttf b/assets/fonts/Poppins-BlackItalic.ttf new file mode 100644 index 0000000..7aeb58b Binary files /dev/null and b/assets/fonts/Poppins-BlackItalic.ttf differ diff --git a/assets/fonts/Poppins-Bold.ttf b/assets/fonts/Poppins-Bold.ttf new file mode 100644 index 0000000..00559ee Binary files /dev/null and b/assets/fonts/Poppins-Bold.ttf differ diff --git a/assets/fonts/Poppins-BoldItalic.ttf b/assets/fonts/Poppins-BoldItalic.ttf new file mode 100644 index 0000000..e61e8e8 Binary files /dev/null and b/assets/fonts/Poppins-BoldItalic.ttf differ diff --git a/assets/fonts/Poppins-ExtraBold.ttf b/assets/fonts/Poppins-ExtraBold.ttf new file mode 100644 index 0000000..df70936 Binary files /dev/null and b/assets/fonts/Poppins-ExtraBold.ttf differ diff --git a/assets/fonts/Poppins-ExtraBoldItalic.ttf b/assets/fonts/Poppins-ExtraBoldItalic.ttf new file mode 100644 index 0000000..14d2b37 Binary files /dev/null and b/assets/fonts/Poppins-ExtraBoldItalic.ttf differ diff --git a/assets/fonts/Poppins-ExtraLight.ttf b/assets/fonts/Poppins-ExtraLight.ttf new file mode 100644 index 0000000..e76ec69 Binary files /dev/null and b/assets/fonts/Poppins-ExtraLight.ttf differ diff --git a/assets/fonts/Poppins-ExtraLightItalic.ttf b/assets/fonts/Poppins-ExtraLightItalic.ttf new file mode 100644 index 0000000..89513d9 Binary files /dev/null and b/assets/fonts/Poppins-ExtraLightItalic.ttf differ diff --git a/assets/fonts/Poppins-Italic.ttf b/assets/fonts/Poppins-Italic.ttf new file mode 100644 index 0000000..12b7b3c Binary files /dev/null and b/assets/fonts/Poppins-Italic.ttf differ diff --git a/assets/fonts/Poppins-Light.ttf b/assets/fonts/Poppins-Light.ttf new file mode 100644 index 0000000..bc36bcc Binary files /dev/null and b/assets/fonts/Poppins-Light.ttf differ diff --git a/assets/fonts/Poppins-LightItalic.ttf b/assets/fonts/Poppins-LightItalic.ttf new file mode 100644 index 0000000..9e70be6 Binary files /dev/null and b/assets/fonts/Poppins-LightItalic.ttf differ diff --git a/assets/fonts/Poppins-MediumItalic.ttf b/assets/fonts/Poppins-MediumItalic.ttf new file mode 100644 index 0000000..be67410 Binary files /dev/null and b/assets/fonts/Poppins-MediumItalic.ttf differ diff --git a/assets/fonts/Poppins-Regular.ttf b/assets/fonts/Poppins-Regular.ttf new file mode 100644 index 0000000..9f0c71b Binary files /dev/null and b/assets/fonts/Poppins-Regular.ttf differ diff --git a/assets/fonts/Poppins-SemiBold.ttf b/assets/fonts/Poppins-SemiBold.ttf new file mode 100644 index 0000000..74c726e Binary files /dev/null and b/assets/fonts/Poppins-SemiBold.ttf differ diff --git a/assets/fonts/Poppins-SemiBoldItalic.ttf b/assets/fonts/Poppins-SemiBoldItalic.ttf new file mode 100644 index 0000000..3e6c942 Binary files /dev/null and b/assets/fonts/Poppins-SemiBoldItalic.ttf differ diff --git a/assets/fonts/Poppins-Thin.ttf b/assets/fonts/Poppins-Thin.ttf new file mode 100644 index 0000000..03e7366 Binary files /dev/null and b/assets/fonts/Poppins-Thin.ttf differ diff --git a/assets/fonts/Poppins-ThinItalic.ttf b/assets/fonts/Poppins-ThinItalic.ttf new file mode 100644 index 0000000..e26db5d Binary files /dev/null and b/assets/fonts/Poppins-ThinItalic.ttf differ diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart index 34d26ba..c181aa1 100644 --- a/lib/classes/consts.dart +++ b/lib/classes/consts.dart @@ -300,8 +300,26 @@ class MyLocales { } class MyFonts { - static const poppinsFont = "packages/mc_common_app/Poppins"; - static const gessTwoFont = "packages/mc_common_app/GessTwo"; + static const poppinsFont = 'Poppins'; + static const gessTwoFont = 'GessTwo'; + + static const FontWeight Thin = FontWeight.w100; + static const FontWeight ExtraLight = FontWeight.w200; + static const FontWeight Light = FontWeight.w300; + static const FontWeight Regular = FontWeight.w400; + static const FontWeight Medium = FontWeight.w500; + static const FontWeight SemiBold = FontWeight.w600; + static const FontWeight Bold = FontWeight.w700; + static const FontWeight ExtraBold = FontWeight.w800; + static const FontWeight Black = FontWeight.w900; + static const FontWeight ItalicRegular = FontWeight.w400; + static const FontWeight ItalicMedium = FontWeight.w500; + static const FontWeight ItalicSemiBold = FontWeight.w600; + static const FontWeight ItalicBold = FontWeight.w700; + static const FontWeight ItalicExtraBold = FontWeight.w800; + static const FontWeight ItalicBlack = FontWeight.w900; + + } class SignalrConsts { diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart index dd6a281..dada9e5 100644 --- a/lib/extensions/string_extensions.dart +++ b/lib/extensions/string_extensions.dart @@ -1,6 +1,7 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.dart'; +import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/enums.dart'; @@ -30,7 +31,7 @@ extension EmailValidator on String { decoration: isUnderLine ? TextDecoration.underline : textDecoration ?? TextDecoration.none, decorationColor: decorationColor, fontSize: fontSize ?? 10, - fontWeight: isBold ? FontWeight.bold : fontWeight ?? FontWeight.w600, + fontWeight: isBold ? FontWeight.bold : fontWeight ?? MyFonts.SemiBold, color: color ?? MyColors.darkTextColor, letterSpacing: letterSpacing, ), diff --git a/lib/theme/app_theme.dart b/lib/theme/app_theme.dart index 72b40fb..ed0cf6a 100644 --- a/lib/theme/app_theme.dart +++ b/lib/theme/app_theme.dart @@ -12,7 +12,7 @@ class AppTheme { primaryTextTheme: const TextTheme( titleLarge: TextStyle(color: Colors.white), ), - colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.orange).copyWith(background: Colors.white), + colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.orange).copyWith(surface: Colors.white), ); } } diff --git a/pubspec.yaml b/pubspec.yaml index 4a5f47b..ea99c0b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -86,7 +86,51 @@ flutter: fonts: - family: Poppins fonts: + - asset: assets/fonts/Poppins-Thin.ttf + weight: 100 + style: normal + - asset: assets/fonts/Poppins-ExtraLight.ttf + weight: 200 + style: normal + - asset: assets/fonts/Poppins-Light.ttf + weight: 300 + style: normal + - asset: assets/fonts/Poppins-Regular.ttf + weight: 400 + style: normal - asset: assets/fonts/Poppins-Medium.ttf + weight: 500 + style: normal + - asset: assets/fonts/Poppins-SemiBold.ttf + weight: 600 + style: normal + - asset: assets/fonts/Poppins-Bold.ttf + weight: 700 + style: normal + - asset: assets/fonts/Poppins-ExtraBold.ttf + weight: 800 + style: normal + - asset: assets/fonts/Poppins-Black.ttf + weight: 900 + style: normal + - asset: assets/fonts/Poppins-Italic.ttf + weight: 400 + style: italic + - asset: assets/fonts/Poppins-MediumItalic.ttf + weight: 500 + style: italic + - asset: assets/fonts/Poppins-SemiBoldItalic.ttf + weight: 600 + style: italic + - asset: assets/fonts/Poppins-BoldItalic.ttf + weight: 700 + style: italic + - asset: assets/fonts/Poppins-ExtraBoldItalic.ttf + weight: 800 + style: italic + - asset: assets/fonts/Poppins-BlackItalic.ttf + weight: 900 + style: italic - family: GessTwo fonts: - asset: assets/fonts/GESS-Two-Light.otf