diff --git a/assets/fonts/Mulish-Black.ttf b/assets/fonts/Mulish-Black.ttf new file mode 100644 index 00000000..83890adc Binary files /dev/null and b/assets/fonts/Mulish-Black.ttf differ diff --git a/assets/fonts/Mulish-BlackItalic.ttf b/assets/fonts/Mulish-BlackItalic.ttf new file mode 100644 index 00000000..7c5f8d72 Binary files /dev/null and b/assets/fonts/Mulish-BlackItalic.ttf differ diff --git a/assets/fonts/Mulish-Bold.ttf b/assets/fonts/Mulish-Bold.ttf new file mode 100644 index 00000000..4e2128d5 Binary files /dev/null and b/assets/fonts/Mulish-Bold.ttf differ diff --git a/assets/fonts/Mulish-BoldItalic.ttf b/assets/fonts/Mulish-BoldItalic.ttf new file mode 100644 index 00000000..fd3fa6c8 Binary files /dev/null and b/assets/fonts/Mulish-BoldItalic.ttf differ diff --git a/assets/fonts/Mulish-ExtraBold.ttf b/assets/fonts/Mulish-ExtraBold.ttf new file mode 100644 index 00000000..294b6ff2 Binary files /dev/null and b/assets/fonts/Mulish-ExtraBold.ttf differ diff --git a/assets/fonts/Mulish-ExtraBoldItalic.ttf b/assets/fonts/Mulish-ExtraBoldItalic.ttf new file mode 100644 index 00000000..efad9565 Binary files /dev/null and b/assets/fonts/Mulish-ExtraBoldItalic.ttf differ diff --git a/assets/fonts/Mulish-ExtraLight.ttf b/assets/fonts/Mulish-ExtraLight.ttf new file mode 100644 index 00000000..f0bcd01d Binary files /dev/null and b/assets/fonts/Mulish-ExtraLight.ttf differ diff --git a/assets/fonts/Mulish-ExtraLightItalic.ttf b/assets/fonts/Mulish-ExtraLightItalic.ttf new file mode 100644 index 00000000..081b8c2c Binary files /dev/null and b/assets/fonts/Mulish-ExtraLightItalic.ttf differ diff --git a/assets/fonts/Mulish-Italic.ttf b/assets/fonts/Mulish-Italic.ttf new file mode 100644 index 00000000..c8f608d9 Binary files /dev/null and b/assets/fonts/Mulish-Italic.ttf differ diff --git a/assets/fonts/Mulish-Light.ttf b/assets/fonts/Mulish-Light.ttf new file mode 100644 index 00000000..53988174 Binary files /dev/null and b/assets/fonts/Mulish-Light.ttf differ diff --git a/assets/fonts/Mulish-LightItalic.ttf b/assets/fonts/Mulish-LightItalic.ttf new file mode 100644 index 00000000..721cb563 Binary files /dev/null and b/assets/fonts/Mulish-LightItalic.ttf differ diff --git a/assets/fonts/Mulish-Medium.ttf b/assets/fonts/Mulish-Medium.ttf new file mode 100644 index 00000000..94cea5a6 Binary files /dev/null and b/assets/fonts/Mulish-Medium.ttf differ diff --git a/assets/fonts/Mulish-MediumItalic.ttf b/assets/fonts/Mulish-MediumItalic.ttf new file mode 100644 index 00000000..0c03d6b6 Binary files /dev/null and b/assets/fonts/Mulish-MediumItalic.ttf differ diff --git a/assets/fonts/Mulish-Regular.ttf b/assets/fonts/Mulish-Regular.ttf new file mode 100644 index 00000000..acf96642 Binary files /dev/null and b/assets/fonts/Mulish-Regular.ttf differ diff --git a/assets/fonts/Mulish-SemiBold.ttf b/assets/fonts/Mulish-SemiBold.ttf new file mode 100644 index 00000000..d45ae78e Binary files /dev/null and b/assets/fonts/Mulish-SemiBold.ttf differ diff --git a/assets/fonts/Mulish-SemiBoldItalic.ttf b/assets/fonts/Mulish-SemiBoldItalic.ttf new file mode 100644 index 00000000..406a403f Binary files /dev/null and b/assets/fonts/Mulish-SemiBoldItalic.ttf differ diff --git a/lib/core/theme/theme_helper.dart b/lib/core/theme/theme_helper.dart index 01f9a96b..d1344e62 100644 --- a/lib/core/theme/theme_helper.dart +++ b/lib/core/theme/theme_helper.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:google_fonts/google_fonts.dart'; + /// Helper class for managing themes and colors. class ThemeHelper { @@ -34,7 +34,8 @@ class ThemeHelper { var colorScheme = _supportedColorScheme[_appTheme] ?? ColorSchemes.primaryColorScheme; return ThemeData( - textTheme: GoogleFonts.mulishTextTheme(), + fontFamily: 'Mulish-Local', + textTheme: ThemeData.light().textTheme.apply(fontFamily: 'Mulish-Local'), visualDensity: VisualDensity.standard, colorScheme: colorScheme, scaffoldBackgroundColor: colorScheme.onPrimary, diff --git a/pubspec.yaml b/pubspec.yaml index 827b7f48..5639ef84 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,6 @@ dependencies: url_launcher: ^6.3.2 easy_debounce: ^2.0.3 badges: ^3.1.2 - google_fonts: ^6.3.3 syncfusion_flutter_charts: ^32.1.20 syncfusion_flutter_gauges: ^32.1.20 table_calendar: ^3.2.0 @@ -112,6 +111,50 @@ flutter: - assets/icons/ - assets/splash/ - assets/lottie_animations/ + + fonts: + - family: Mulish-Local + fonts: + - asset: assets/fonts/Mulish-ExtraLight.ttf + weight: 200 + - asset: assets/fonts/Mulish-ExtraLightItalic.ttf + weight: 200 + style: italic + - asset: assets/fonts/Mulish-Light.ttf + weight: 300 + - asset: assets/fonts/Mulish-LightItalic.ttf + weight: 300 + style: italic + - asset: assets/fonts/Mulish-Regular.ttf + weight: 400 + - asset: assets/fonts/Mulish-Italic.ttf + weight: 400 + style: italic + - asset: assets/fonts/Mulish-Medium.ttf + weight: 500 + - asset: assets/fonts/Mulish-MediumItalic.ttf + weight: 500 + style: italic + - asset: assets/fonts/Mulish-SemiBold.ttf + weight: 600 + - asset: assets/fonts/Mulish-SemiBoldItalic.ttf + weight: 600 + style: italic + - asset: assets/fonts/Mulish-Bold.ttf + weight: 700 + - asset: assets/fonts/Mulish-BoldItalic.ttf + weight: 700 + style: italic + - asset: assets/fonts/Mulish-ExtraBold.ttf + weight: 800 + - asset: assets/fonts/Mulish-ExtraBoldItalic.ttf + weight: 800 + style: italic + - asset: assets/fonts/Mulish-Black.ttf + weight: 900 + - asset: assets/fonts/Mulish-BlackItalic.ttf + weight: 900 + style: italic flutter_intl: enabled: true