diff --git a/assets/fonts/Karla-VariableFont_wght.ttf b/assets/fonts/Karla-VariableFont_wght.ttf new file mode 100644 index 00000000..8dc0439b Binary files /dev/null and b/assets/fonts/Karla-VariableFont_wght.ttf differ diff --git a/assets/fonts/Montserrat-Regular.ttf b/assets/fonts/Montserrat-Regular.ttf new file mode 100644 index 00000000..f4a266dd Binary files /dev/null and b/assets/fonts/Montserrat-Regular.ttf differ diff --git a/lib/new_ui/screens/main_screen/main_screen.dart b/lib/new_ui/screens/main_screen/main_screen.dart index df0c0e11..8144fc2f 100644 --- a/lib/new_ui/screens/main_screen/main_screen.dart +++ b/lib/new_ui/screens/main_screen/main_screen.dart @@ -444,7 +444,10 @@ class _MainScreenState extends ConsumerState { .of(context) .textTheme .headlineLarge! - .copyWith(fontSize: 20), + .copyWith( + fontSize: 20, + fontFamily: 'Karla' + ), ), SizedBox(height: 5,), Text( @@ -478,6 +481,7 @@ class _MainScreenState extends ConsumerState { .headlineMedium! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: currentPage == 0 ? Theme .of(context) @@ -524,6 +528,7 @@ class _MainScreenState extends ConsumerState { .headlineMedium! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: currentPage == 7 ? Theme .of(context) @@ -555,6 +560,7 @@ class _MainScreenState extends ConsumerState { .headlineSmall! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: currentPage == 6 ? Theme .of(context) @@ -590,6 +596,7 @@ class _MainScreenState extends ConsumerState { .headlineSmall! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: currentPage == 5 ? Theme .of(context) @@ -660,6 +667,7 @@ class _MainScreenState extends ConsumerState { .headlineMedium! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: Colors.white, ), ), @@ -690,6 +698,7 @@ class _MainScreenState extends ConsumerState { .headlineMedium! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: currentPage == 4 ? Theme .of(context) @@ -713,6 +722,7 @@ class _MainScreenState extends ConsumerState { .headlineSmall! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: currentPage == 5 ? Theme .of(context) @@ -744,6 +754,7 @@ class _MainScreenState extends ConsumerState { .headlineSmall! .copyWith( fontSize: 13, + fontFamily: 'Montserrat', color: currentPage == 5 ? Theme .of(context) diff --git a/pubspec.yaml b/pubspec.yaml index 78fae17a..0f25aa9c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -127,6 +127,13 @@ flutter: weight: 400 - asset: assets/fonts/SF-Pro-Text-Semibold.otf weight: 600 + - family: Montserrat + fonts: + - asset: assets/fonts/Montserrat-Regular.ttf + weight: 400 + - family: Karla + fonts: + - asset: assets/fonts/Karla-VariableFont_wght.ttf - family: Priego fonts: - asset: assets/fonts/priego-extrabold.otf