diff --git a/assets/fonts/nunito/Nunito-Bold.ttf b/assets/fonts/nunito/Nunito-Bold.ttf new file mode 100644 index 0000000..6909689 Binary files /dev/null and b/assets/fonts/nunito/Nunito-Bold.ttf differ diff --git a/assets/fonts/nunito/Nunito-ExtraBold.ttf b/assets/fonts/nunito/Nunito-ExtraBold.ttf new file mode 100644 index 0000000..6f4ccde Binary files /dev/null and b/assets/fonts/nunito/Nunito-ExtraBold.ttf differ diff --git a/assets/fonts/nunito/Nunito-Medium.ttf b/assets/fonts/nunito/Nunito-Medium.ttf new file mode 100644 index 0000000..a6993eb Binary files /dev/null and b/assets/fonts/nunito/Nunito-Medium.ttf differ diff --git a/assets/fonts/nunito/Nunito-Regular.ttf b/assets/fonts/nunito/Nunito-Regular.ttf new file mode 100644 index 0000000..be80c3f Binary files /dev/null and b/assets/fonts/nunito/Nunito-Regular.ttf differ diff --git a/assets/fonts/nunito/Nunito-SemiBold.ttf b/assets/fonts/nunito/Nunito-SemiBold.ttf new file mode 100644 index 0000000..06f29ea Binary files /dev/null and b/assets/fonts/nunito/Nunito-SemiBold.ttf differ diff --git a/assets/fonts/poppins/Poppins-Bold.ttf b/assets/fonts/poppins/Poppins-Bold.ttf new file mode 100644 index 0000000..00559ee Binary files /dev/null and b/assets/fonts/poppins/Poppins-Bold.ttf differ diff --git a/assets/fonts/poppins/Poppins-ExtraBold.ttf b/assets/fonts/poppins/Poppins-ExtraBold.ttf new file mode 100644 index 0000000..df70936 Binary files /dev/null and b/assets/fonts/poppins/Poppins-ExtraBold.ttf differ diff --git a/assets/fonts/poppins/Poppins-Medium.ttf b/assets/fonts/poppins/Poppins-Medium.ttf new file mode 100644 index 0000000..6bcdcc2 Binary files /dev/null and b/assets/fonts/poppins/Poppins-Medium.ttf differ diff --git a/assets/fonts/poppins/Poppins-Regular.ttf b/assets/fonts/poppins/Poppins-Regular.ttf new file mode 100644 index 0000000..9f0c71b Binary files /dev/null and b/assets/fonts/poppins/Poppins-Regular.ttf differ diff --git a/assets/fonts/poppins/Poppins-SemiBold.ttf b/assets/fonts/poppins/Poppins-SemiBold.ttf new file mode 100644 index 0000000..74c726e Binary files /dev/null and b/assets/fonts/poppins/Poppins-SemiBold.ttf differ diff --git a/assets/flutter_01.png b/assets/images/flutter_01.png similarity index 100% rename from assets/flutter_01.png rename to assets/images/flutter_01.png diff --git a/assets/flutter_02.png b/assets/images/flutter_02.png similarity index 100% rename from assets/flutter_02.png rename to assets/images/flutter_02.png diff --git a/assets/flutter_03.png b/assets/images/flutter_03.png similarity index 100% rename from assets/flutter_03.png rename to assets/images/flutter_03.png diff --git a/assets/screenshot_dashboard.png b/assets/images/screenshot_dashboard.png similarity index 100% rename from assets/screenshot_dashboard.png rename to assets/images/screenshot_dashboard.png diff --git a/lib/app/theme.dart b/lib/app/theme.dart index 13aa1ff..9bdba93 100644 --- a/lib/app/theme.dart +++ b/lib/app/theme.dart @@ -2,34 +2,39 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import '../core/constants.dart'; -final _nunitoFamily = GoogleFonts.nunito().fontFamily; -TextTheme _withCyrillicFallback(TextTheme theme) { - return theme.copyWith( - displayLarge: theme.displayLarge?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - displayMedium: theme.displayMedium?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - displaySmall: theme.displaySmall?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - headlineLarge: theme.headlineLarge?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - headlineMedium: theme.headlineMedium?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - headlineSmall: theme.headlineSmall?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - titleLarge: theme.titleLarge?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - titleMedium: theme.titleMedium?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - titleSmall: theme.titleSmall?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - bodyLarge: theme.bodyLarge?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - bodyMedium: theme.bodyMedium?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - bodySmall: theme.bodySmall?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - labelLarge: theme.labelLarge?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - labelMedium: theme.labelMedium?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - labelSmall: theme.labelSmall?.copyWith(fontFamilyFallback: [_nunitoFamily!]), - ); +TextStyle? _f(TextStyle? s) { + final result = s?.copyWith(fontFamilyFallback: ['NunitoCyrillic']); + debugPrint('fallback: ${result?.fontFamilyFallback}'); // проверь в логах + return result; } +TextTheme _withCyrillicFallback(TextTheme t) => TextTheme( + displayLarge: _f(t.displayLarge), + displayMedium: _f(t.displayMedium), + displaySmall: _f(t.displaySmall), + headlineLarge: _f(t.headlineLarge), + headlineMedium: _f(t.headlineMedium), + headlineSmall: _f(t.headlineSmall), + titleLarge: _f(t.titleLarge), + titleMedium: _f(t.titleMedium), + titleSmall: _f(t.titleSmall), + bodyLarge: _f(t.bodyLarge), + bodyMedium: _f(t.bodyMedium), + bodySmall: _f(t.bodySmall), + labelLarge: _f(t.labelLarge), + labelMedium: _f(t.labelMedium), + labelSmall: _f(t.labelSmall), +); + + class AppTheme { static ThemeData get darkTheme { final base = ThemeData.dark(useMaterial3: true); final textTheme = _withCyrillicFallback( - GoogleFonts.poppinsTextTheme(base.textTheme).apply( + base.textTheme.apply( + fontFamily: 'Poppins', bodyColor: AppColors.textPrimary, displayColor: AppColors.textPrimary, ), diff --git a/lib/main.dart b/lib/main.dart index 031acd5..4920336 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -14,14 +14,7 @@ void main() async { await initializeDateFormatting('ru_RU', null); await initializeDateFormatting('en', null); await initializeDateFormatting('ru', null); - await GoogleFonts.pendingFonts([ - GoogleFonts.nunito(), - GoogleFonts.nunito(fontWeight: FontWeight.w600), - GoogleFonts.nunito(fontWeight: FontWeight.w700), - GoogleFonts.nunito(fontWeight: FontWeight.w800), - ]); - final prefs = await SharedPreferences.getInstance(); await HapticService.init(); diff --git a/pubspec.yaml b/pubspec.yaml index f9ee389..3dfcd1a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -53,3 +53,26 @@ dev_dependencies: flutter: uses-material-design: true + fonts: + - family: NunitoCyrillic + fonts: + - asset: assets/fonts/nunito/Nunito-Medium.ttf + - asset: assets/fonts/nunito/Nunito-SemiBold.ttf + weight: 500 + - asset: assets/fonts/nunito/Nunito-Bold.ttf + weight: 600 + - asset: assets/fonts/nunito/Nunito-ExtraBold.ttf + weight: 700 + - asset: assets/fonts/nunito/Nunito-ExtraBold.ttf + weight: 800 + - family: Poppins + fonts: + - asset: assets/fonts/poppins/Poppins-Regular.ttf + - asset: assets/fonts/poppins/Poppins-Medium.ttf + weight: 500 + - asset: assets/fonts/poppins/Poppins-SemiBold.ttf + weight: 600 + - asset: assets/fonts/poppins/Poppins-Bold.ttf + weight: 700 + - asset: assets/fonts/poppins/Poppins-ExtraBold.ttf + weight: 800