From 2bce9c1b74f2ad6c16b398e05c5f73cd7d4dfb00 Mon Sep 17 00:00:00 2001 From: petrovyuri Date: Tue, 29 Apr 2025 18:34:42 +0300 Subject: [PATCH] =?UTF-8?q?fix(pubspec):=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D0=BD=D0=BE=D1=82=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8E=20fluttergen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app/app_config/app_config.g.dart | 148 +++++++++++++-------------- lib/gen/assets.gen.dart | 49 ++++----- pubspec.yaml | 6 +- 3 files changed, 98 insertions(+), 105 deletions(-) diff --git a/lib/app/app_config/app_config.g.dart b/lib/app/app_config/app_config.g.dart index ca2c5fa..31bfec1 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 = [ - 45820206, - 4292305074, - 1553598735, + 4165345137, + 3493800243, + 502170426, ]; static const List _envieddatasecretKey = [ - 45820234, - 4292305111, - 1553598841, + 4165345045, + 3493800278, + 502170444, ]; static final String secretKey = String.fromCharCodes(List.generate( @@ -36,33 +36,33 @@ final class _Dev { // generated_from: env/prod.env final class _Prod { static const List _enviedkeybaseUrl = [ - 3619294633, - 560029786, - 3178585068, - 3377720392, - 977735066, - 2142081055, - 1298585806, - 933917938, - 1244996901, - 1950368931, - 2147265964, - 2338251746, + 1959698309, + 1370422491, + 1593239974, + 2980796982, + 3484307801, + 2340951854, + 4002048327, + 2957329110, + 3569108013, + 2324336979, + 691664904, + 2999310215, ]; static const List _envieddatabaseUrl = [ - 3619294657, - 560029742, - 3178584984, - 3377720376, - 977735145, - 2142081061, - 1298585825, - 933917917, - 1244996949, - 1950368977, - 2147265987, - 2338251654, + 1959698413, + 1370422447, + 1593240018, + 2980796998, + 3484307754, + 2340951828, + 4002048360, + 2957329145, + 3569108061, + 2324336929, + 691664999, + 2999310307, ]; static final String baseUrl = String.fromCharCodes(List.generate( @@ -72,17 +72,17 @@ final class _Prod { ).map((int i) => _envieddatabaseUrl[i] ^ _enviedkeybaseUrl[i])); static const List _enviedkeysecretKey = [ - 2449171331, - 2315988352, - 1037757119, - 3159274193, + 4268709792, + 3715718791, + 3691995036, + 2677812110, ]; static const List _envieddatasecretKey = [ - 2449171443, - 2315988466, - 1037757136, - 3159274165, + 4268709840, + 3715718901, + 3691995123, + 2677812202, ]; static final String secretKey = String.fromCharCodes(List.generate( @@ -97,35 +97,35 @@ final class _Prod { // generated_from: env/stage.env final class _Stage { static const List _enviedkeybaseUrl = [ - 443716089, - 3928907238, - 1851881210, - 3858110087, - 3324475128, - 1601592105, - 2404110281, - 1092690431, - 1025677374, - 3283672546, - 425122182, - 3412521909, - 1297182020, + 3824074796, + 1785932277, + 700105518, + 2614901365, + 2850858902, + 3082107206, + 3784178565, + 815141967, + 4277092750, + 3942345021, + 1481955512, + 3678805330, + 206487437, ]; static const List _envieddatabaseUrl = [ - 443715985, - 3928907154, - 1851881102, - 3858110199, - 3324475019, - 1601592083, - 2404110310, - 1092690384, - 1025677389, - 3283672470, - 425122279, - 3412521938, - 1297181985, + 3824074820, + 1785932161, + 700105562, + 2614901253, + 2850858981, + 3082107260, + 3784178602, + 815141984, + 4277092861, + 3942345033, + 1481955545, + 3678805301, + 206487528, ]; static final String baseUrl = String.fromCharCodes(List.generate( @@ -135,19 +135,19 @@ final class _Stage { ).map((int i) => _envieddatabaseUrl[i] ^ _enviedkeybaseUrl[i])); static const List _enviedkeysecretKey = [ - 58874248, - 3497500657, - 3833421599, - 555777488, - 132619188, + 1473916388, + 2313056220, + 2069119783, + 32407210, + 317937387, ]; static const List _envieddatasecretKey = [ - 58874363, - 3497500549, - 3833421694, - 555777463, - 132619217, + 1473916311, + 2313056168, + 2069119814, + 32407245, + 317937294, ]; static final String secretKey = String.fromCharCodes(List.generate( diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index cd0b6e2..73a827c 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -33,12 +33,12 @@ class $AssetsFontsGen { /// List of all assets List get values => [ - montserratBold, - montserratExtraBold, - montserratMedium, - montserratRegular, - montserratSemiBold - ]; + montserratBold, + montserratExtraBold, + montserratMedium, + montserratRegular, + montserratSemiBold, + ]; } class $AssetsIconsGen { @@ -63,7 +63,7 @@ class $AssetsLottieGen { } class Assets { - Assets._(); + const Assets._(); static const $AssetsFontsGen fonts = $AssetsFontsGen(); static const $AssetsIconsGen icons = $AssetsIconsGen(); @@ -71,17 +71,11 @@ class Assets { } class SvgGenImage { - const SvgGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }) : _isVecFormat = false; + const SvgGenImage(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; - const SvgGenImage.vec( - this._assetName, { - this.size, - this.flavors = const {}, - }) : _isVecFormat = true; + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -135,7 +129,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, @@ -148,10 +143,7 @@ class SvgGenImage { } class LottieGenImage { - const LottieGenImage( - this._assetName, { - this.flavors = const {}, - }); + const LottieGenImage(this._assetName, {this.flavors = const {}}); final String _assetName; final Set flavors; @@ -168,11 +160,8 @@ class LottieGenImage { _lottie.LottieImageProviderFactory? imageProviderFactory, Key? key, AssetBundle? bundle, - Widget Function( - BuildContext, - Widget, - _lottie.LottieComposition?, - )? frameBuilder, + Widget Function(BuildContext, Widget, _lottie.LottieComposition?)? + frameBuilder, ImageErrorWidgetBuilder? errorBuilder, double? width, double? height, @@ -182,6 +171,9 @@ class LottieGenImage { bool? addRepaintBoundary, FilterQuality? filterQuality, void Function(String)? onWarning, + _lottie.LottieDecoder? decoder, + _lottie.RenderCache? renderCache, + bool? backgroundLoading, }) { return _lottie.Lottie.asset( _assetName, @@ -206,6 +198,9 @@ class LottieGenImage { addRepaintBoundary: addRepaintBoundary, filterQuality: filterQuality, onWarning: onWarning, + decoder: decoder, + renderCache: renderCache, + backgroundLoading: backgroundLoading, ); } diff --git a/pubspec.yaml b/pubspec.yaml index e128692..cf57f8c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -77,9 +77,7 @@ flutter: weight: 400 flutter_gen: - options: - output: lib/gen/ - line_length: 100 + integrations: flutter_svg: true - lottie: true + lottie: true \ No newline at end of file