diff --git a/assets/fonts/Montserrat-Bold.ttf b/assets/fonts/Montserrat-Bold.ttf deleted file mode 100644 index 0927b81..0000000 Binary files a/assets/fonts/Montserrat-Bold.ttf and /dev/null differ diff --git a/assets/fonts/Montserrat-ExtraBold.ttf b/assets/fonts/Montserrat-ExtraBold.ttf deleted file mode 100644 index e33afd4..0000000 Binary files a/assets/fonts/Montserrat-ExtraBold.ttf and /dev/null differ diff --git a/assets/fonts/Montserrat-Medium.ttf b/assets/fonts/Montserrat-Medium.ttf deleted file mode 100644 index 4012225..0000000 Binary files a/assets/fonts/Montserrat-Medium.ttf and /dev/null differ diff --git a/assets/fonts/Montserrat-Regular.ttf b/assets/fonts/Montserrat-Regular.ttf deleted file mode 100644 index f4a266d..0000000 Binary files a/assets/fonts/Montserrat-Regular.ttf and /dev/null differ diff --git a/assets/fonts/Montserrat-SemiBold.ttf b/assets/fonts/Montserrat-SemiBold.ttf deleted file mode 100644 index 189ce9d..0000000 Binary files a/assets/fonts/Montserrat-SemiBold.ttf and /dev/null differ diff --git a/lib/app/app_config/app_config.g.dart b/lib/app/app_config/app_config.g.dart index caef5d6..4d451c4 100644 --- a/lib/app/app_config/app_config.g.dart +++ b/lib/app/app_config/app_config.g.dart @@ -13,15 +13,15 @@ final class _Dev { static const String baseUrl = 'https://dev'; static const List _enviedkeysecretKey = [ - 1144186709, - 921404830, - 4081271781, + 1799992456, + 3121235721, + 1896517115, ]; static const List _envieddatasecretKey = [ - 1144186673, - 921404923, - 4081271699, + 1799992556, + 3121235820, + 1896517005, ]; static final String secretKey = String.fromCharCodes( @@ -38,33 +38,33 @@ final class _Dev { // generated_from: env/prod.env final class _Prod { static const List _enviedkeybaseUrl = [ - 3830062036, - 1024953349, - 2723997296, - 2959773775, - 4255295633, - 114701674, - 1920572043, - 3423730200, - 3647804248, - 2815792265, - 3038381766, - 655048609, + 1627073061, + 1329144317, + 4010373711, + 41847181, + 869222509, + 509998400, + 1912743375, + 3591333682, + 1441008454, + 2168353742, + 3600711694, + 2824342757, ]; static const List _envieddatabaseUrl = [ - 3830062012, - 1024953457, - 2723997188, - 2959773759, - 4255295714, - 114701648, - 1920572068, - 3423730231, - 3647804200, - 2815792379, - 3038381737, - 655048645, + 1627073101, + 1329144201, + 4010373691, + 41847293, + 869222430, + 509998458, + 1912743392, + 3591333661, + 1441008438, + 2168353724, + 3600711777, + 2824342657, ]; static final String baseUrl = String.fromCharCodes( @@ -76,17 +76,17 @@ final class _Prod { ); static const List _enviedkeysecretKey = [ - 359753139, - 3208048313, - 1722903860, - 3044498179, + 491371727, + 838972038, + 2580624111, + 1889389419, ]; static const List _envieddatasecretKey = [ - 359753155, - 3208048331, - 1722903899, - 3044498279, + 491371711, + 838972148, + 2580624000, + 1889389327, ]; static final String secretKey = String.fromCharCodes( @@ -103,35 +103,35 @@ final class _Prod { // generated_from: env/stage.env final class _Stage { static const List _enviedkeybaseUrl = [ - 2791397647, - 1739207173, - 306419752, - 1371918084, - 4062400488, - 3004897854, - 2820011348, - 1751321626, - 3103957517, - 2168627914, - 1003673382, - 1168070657, - 568662299, + 585835488, + 3326410961, + 3188945183, + 460492541, + 1928378853, + 1675035574, + 2754976633, + 2459126129, + 3745790828, + 3098981050, + 99445498, + 3535573105, + 3875375463, ]; static const List _envieddatabaseUrl = [ - 2791397735, - 1739207281, - 306419804, - 1371918196, - 4062400411, - 3004897796, - 2820011387, - 1751321653, - 3103957630, - 2168627902, - 1003673415, - 1168070758, - 568662398, + 585835400, + 3326410917, + 3188945259, + 460492429, + 1928378774, + 1675035532, + 2754976598, + 2459126110, + 3745790751, + 3098981070, + 99445403, + 3535573014, + 3875375362, ]; static final String baseUrl = String.fromCharCodes( @@ -143,19 +143,19 @@ final class _Stage { ); static const List _enviedkeysecretKey = [ - 2132342089, - 2579069434, - 3904165526, - 3391356107, - 1192880530, + 986583346, + 12639897, + 2122410836, + 1036379862, + 1792372112, ]; static const List _envieddatasecretKey = [ - 2132342074, - 2579069326, - 3904165623, - 3391356076, - 1192880631, + 986583361, + 12639981, + 2122410805, + 1036379825, + 1792372213, ]; static final String secretKey = String.fromCharCodes( diff --git a/lib/features/debug/screens/lang_screen.dart b/lib/features/debug/screens/lang_screen.dart index d255f8d..0e6b83d 100644 --- a/lib/features/debug/screens/lang_screen.dart +++ b/lib/features/debug/screens/lang_screen.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import 'package:friflex_starter/app/app_context_ext.dart'; import 'package:friflex_starter/app/theme/app_colors_scheme.dart'; -import 'package:friflex_starter/gen/assets.gen.dart'; -import 'package:friflex_starter/gen/fonts.gen.dart'; /// {@template lang_screen} /// Экран для отладки и тестирования локализации приложения. @@ -42,18 +40,12 @@ class LangScreen extends StatelessWidget { const SizedBox(height: 16), Text( 'Тестовое слово bold: ${context.l10n.helloWorld}', - style: TextStyle( - color: context.appColors.testColor, - fontFamily: Assets.fonts.montserratBold, - ), + style: TextStyle(color: context.appColors.testColor), ), const SizedBox(height: 16), Text( 'Тестовое слово medium: ${context.l10n.helloWorld}', - style: TextStyle( - color: context.appColors.testColor, - fontFamily: FontFamily.montserrat, - ), + style: TextStyle(color: context.appColors.testColor), ), const SizedBox(height: 16), Text('Текущий язык: ${context.l10n.localeName}'), diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 9f82f24..877bf67 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -13,34 +13,6 @@ import 'package:flutter_svg/flutter_svg.dart' as _svg; import 'package:lottie/lottie.dart' as _lottie; import 'package:vector_graphics/vector_graphics.dart' as _vg; -class $AssetsFontsGen { - const $AssetsFontsGen(); - - /// File path: assets/fonts/Montserrat-Bold.ttf - String get montserratBold => 'assets/fonts/Montserrat-Bold.ttf'; - - /// File path: assets/fonts/Montserrat-ExtraBold.ttf - String get montserratExtraBold => 'assets/fonts/Montserrat-ExtraBold.ttf'; - - /// File path: assets/fonts/Montserrat-Medium.ttf - String get montserratMedium => 'assets/fonts/Montserrat-Medium.ttf'; - - /// File path: assets/fonts/Montserrat-Regular.ttf - String get montserratRegular => 'assets/fonts/Montserrat-Regular.ttf'; - - /// File path: assets/fonts/Montserrat-SemiBold.ttf - String get montserratSemiBold => 'assets/fonts/Montserrat-SemiBold.ttf'; - - /// List of all assets - List get values => [ - montserratBold, - montserratExtraBold, - montserratMedium, - montserratRegular, - montserratSemiBold, - ]; -} - class $AssetsIconsGen { const $AssetsIconsGen(); @@ -63,9 +35,8 @@ class $AssetsLottieGen { } class Assets { - Assets._(); + const Assets._(); - static const $AssetsFontsGen fonts = $AssetsFontsGen(); static const $AssetsIconsGen icons = $AssetsIconsGen(); static const $AssetsLottieGen lottie = $AssetsLottieGen(); } @@ -171,6 +142,9 @@ class LottieGenImage { bool? addRepaintBoundary, FilterQuality? filterQuality, void Function(String)? onWarning, + _lottie.LottieDecoder? decoder, + _lottie.RenderCache? renderCache, + bool? backgroundLoading, }) { return _lottie.Lottie.asset( _assetName, @@ -195,6 +169,9 @@ class LottieGenImage { addRepaintBoundary: addRepaintBoundary, filterQuality: filterQuality, onWarning: onWarning, + decoder: decoder, + renderCache: renderCache, + backgroundLoading: backgroundLoading, ); } diff --git a/lib/gen/fonts.gen.dart b/lib/gen/fonts.gen.dart deleted file mode 100644 index 62059d8..0000000 --- a/lib/gen/fonts.gen.dart +++ /dev/null @@ -1,15 +0,0 @@ -/// GENERATED CODE - DO NOT MODIFY BY HAND -/// ***************************************************** -/// FlutterGen -/// ***************************************************** - -// coverage:ignore-file -// ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use - -class FontFamily { - FontFamily._(); - - /// Font family: Montserrat - static const String montserrat = 'Montserrat'; -} diff --git a/pubspec.yaml b/pubspec.yaml index cec8472..7501aa6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -61,23 +61,8 @@ flutter: generate: true assets: - assets/icons/ - - assets/fonts/ - assets/lottie/ - fonts: - - family: Montserrat - fonts: - - asset: assets/fonts/Montserrat-ExtraBold.ttf - weight: 800 - - asset: assets/fonts/Montserrat-Bold.ttf - weight: 700 - - asset: assets/fonts/Montserrat-SemiBold.ttf - weight: 600 - - asset: assets/fonts/Montserrat-Medium.ttf - weight: 500 - - asset: assets/fonts/Montserrat-Regular.ttf - weight: 400 - flutter_gen: integrations: flutter_svg: true