From 26650587db62fe3089bc58da6da6e73c26c75c36 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:04:37 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=F0=9F=94=8A=20Put=20a=20blank=20line=20b?= =?UTF-8?q?efore=20the=20deprecated=20style=20logs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/generators/assets_generator.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/lib/generators/assets_generator.dart b/packages/core/lib/generators/assets_generator.dart index fea0a970..cd8ddd68 100644 --- a/packages/core/lib/generators/assets_generator.dart +++ b/packages/core/lib/generators/assets_generator.dart @@ -84,7 +84,7 @@ Future generateAssets( final deprecatedPackageParam = config.flutterGen.assets.packageParameterEnabled != null; if (deprecatedStyle || deprecatedPackageParam) { - final deprecationBuffer = StringBuffer(); + final deprecationBuffer = StringBuffer('\n'); if (deprecatedStyle) { deprecationBuffer.writeln( sBuildDeprecation( From 7b674f8db40917c11a7d6472f2cdf65a49bc0830 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:23:46 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Rewrite=20`safeCast`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/utils/cast.dart | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/core/lib/utils/cast.dart b/packages/core/lib/utils/cast.dart index 7d9858ac..8c4e2bf5 100644 --- a/packages/core/lib/utils/cast.dart +++ b/packages/core/lib/utils/cast.dart @@ -1 +1,9 @@ -T? safeCast(dynamic value) => value is T ? value : null; +/// Returns the value if it is the same type as [T], otherwise `null`. +/// +/// [T] must be non-nullable since the return type is nullable. +T? safeCast(Object? value) { + return switch (value) { + final T v => v, + _ => null, + }; +} From 7b527c78f1d3b4775e44efb74e3c66972330c943 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:29:23 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Read=20Dart=20SDK=20?= =?UTF-8?q?constraint=20from=20`pubspec.lock`=20->=20`pubspec.yaml`=20->?= =?UTF-8?q?=20`Platform.version`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/settings/config.dart | 38 +++++++++++++++++++++++--- packages/core/lib/utils/formatter.dart | 13 +++++---- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/packages/core/lib/settings/config.dart b/packages/core/lib/settings/config.dart index eb8c86f9..41f1f1c6 100644 --- a/packages/core/lib/settings/config.dart +++ b/packages/core/lib/settings/config.dart @@ -2,18 +2,25 @@ import 'dart:io'; import 'package:flutter_gen_core/settings/config_default.dart'; import 'package:flutter_gen_core/settings/pubspec.dart'; +import 'package:flutter_gen_core/utils/cast.dart' show safeCast; import 'package:flutter_gen_core/utils/error.dart'; import 'package:flutter_gen_core/utils/log.dart'; import 'package:flutter_gen_core/utils/map.dart'; import 'package:flutter_gen_core/version.gen.dart'; import 'package:path/path.dart'; +import 'package:pub_semver/pub_semver.dart' show VersionConstraint; import 'package:yaml/yaml.dart'; class Config { - const Config._({required this.pubspec, required this.pubspecFile}); + const Config._({ + required this.pubspec, + required this.pubspecFile, + required this.sdkConstraint, + }); final Pubspec pubspec; final File pubspecFile; + final VersionConstraint? sdkConstraint; } Config loadPubspecConfig(File pubspecFile, {File? buildFile}) { @@ -24,10 +31,16 @@ Config loadPubspecConfig(File pubspecFile, {File? buildFile}) { log.info('v$packageVersion Loading ...'); log.info('Reading options from $pubspecLocaleHint'); - final defaultMap = loadYaml(configDefaultYamlContent) as Map?; + VersionConstraint? sdkConstraint; + + final defaultMap = loadYaml(configDefaultYamlContent) as YamlMap?; final pubspecContent = pubspecFile.readAsStringSync(); - final pubspecMap = loadYaml(pubspecContent) as Map?; + final pubspecMap = loadYaml(pubspecContent) as YamlMap?; + if (safeCast(pubspecMap?['environment']?['sdk']) case final sdk?) { + sdkConstraint = VersionConstraint.parse(sdk); + } + Map mergedMap = mergeMap([defaultMap, pubspecMap]); YamlMap? getBuildFileOptions(File file) { @@ -76,7 +89,24 @@ Config loadPubspecConfig(File pubspecFile, {File? buildFile}) { } final pubspec = Pubspec.fromJson(mergedMap); - return Config._(pubspec: pubspec, pubspecFile: pubspecFile); + + final pubspecLockFile = File( + normalize(join(basename(pubspecFile.parent.path), 'pubspec.lock')), + ); + final pubspecLockContent = switch (pubspecLockFile.existsSync()) { + true => pubspecLockFile.readAsStringSync(), + false => '', + }; + final pubspecLockMap = loadYaml(pubspecLockContent) as YamlMap?; + if (safeCast(pubspecLockMap?['sdks']?['dart']) case final sdk?) { + sdkConstraint = VersionConstraint.parse(sdk); + } + + return Config._( + pubspec: pubspec, + pubspecFile: pubspecFile, + sdkConstraint: sdkConstraint, + ); } Config? loadPubspecConfigOrNull(File pubspecFile, {File? buildFile}) { diff --git a/packages/core/lib/utils/formatter.dart b/packages/core/lib/utils/formatter.dart index 61a550e0..59f8d569 100644 --- a/packages/core/lib/utils/formatter.dart +++ b/packages/core/lib/utils/formatter.dart @@ -1,3 +1,5 @@ +import 'dart:io' as io show Platform; + import 'package:dart_style/dart_style.dart' show DartFormatter; import 'package:pub_semver/pub_semver.dart' show VersionConstraint; @@ -5,11 +7,12 @@ import '../settings/config.dart' show Config; /// The formatter will only use the tall-style if the SDK constraint is ^3.7. DartFormatter buildDartFormatterFromConfig(Config config) { - final sdkConstraint = config.pubspec.environment['sdk']; - final useShort = switch (sdkConstraint) { - final c? => c.allowsAny(VersionConstraint.parse('<3.7.0')), - _ => true, - }; + VersionConstraint? sdkConstraint = config.sdkConstraint; + if (sdkConstraint == null) { + final version = io.Platform.version.split(' ').first; + sdkConstraint = VersionConstraint.parse('^$version'); + } + final useShort = sdkConstraint.allowsAny(VersionConstraint.parse('<3.7.0')); return DartFormatter( languageVersion: useShort ? DartFormatter.latestShortStyleLanguageVersion From e827e71498f994765689049912b6c2b5cf7d044d Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:40:51 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=F0=9F=9A=80=20Allow=20`FlutterGen.lineLe?= =?UTF-8?q?ngth`=20to=20be=20nullable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/settings/pubspec.dart | 4 ++-- packages/core/lib/settings/pubspec.g.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/lib/settings/pubspec.dart b/packages/core/lib/settings/pubspec.dart index 480aaa5d..5732ef74 100644 --- a/packages/core/lib/settings/pubspec.dart +++ b/packages/core/lib/settings/pubspec.dart @@ -114,8 +114,8 @@ class FlutterGen { @JsonKey(name: 'output', required: true) final String output; - @JsonKey(name: 'line_length', required: true) - final int lineLength; + @JsonKey(name: 'line_length') + final int? lineLength; @JsonKey(name: 'parse_metadata', required: true) final bool parseMetadata; diff --git a/packages/core/lib/settings/pubspec.g.dart b/packages/core/lib/settings/pubspec.g.dart index af71498b..93fe1742 100644 --- a/packages/core/lib/settings/pubspec.g.dart +++ b/packages/core/lib/settings/pubspec.g.dart @@ -81,7 +81,6 @@ FlutterGen _$FlutterGenFromJson(Map json) => $checkedCreate( ], requiredKeys: const [ 'output', - 'line_length', 'parse_metadata', 'assets', 'fonts', @@ -91,7 +90,8 @@ FlutterGen _$FlutterGenFromJson(Map json) => $checkedCreate( ); final val = FlutterGen( output: $checkedConvert('output', (v) => v as String), - lineLength: $checkedConvert('line_length', (v) => (v as num).toInt()), + lineLength: + $checkedConvert('line_length', (v) => (v as num?)?.toInt()), parseMetadata: $checkedConvert('parse_metadata', (v) => v as bool), assets: $checkedConvert( 'assets', (v) => FlutterGenAssets.fromJson(v as Map)), From 4b319bda212ca8cb7aae4757b3068066c5edcc6f Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:41:39 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=F0=9F=94=A7=20Update=20default=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- README.md | 4 +-- examples/example/pubspec.yaml | 2 +- examples/example_resources/pubspec.yaml | 1 - .../core/lib/settings/config_default.dart | 36 +++++++------------ 5 files changed, 16 insertions(+), 29 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 432f3548..27da1d5a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -52,7 +52,7 @@ body: flutter_gen: output: lib/gen/ - line_length: 80 + # line_length: 80 integrations: flutter_svg: true diff --git a/README.md b/README.md index 7a63385e..3c9dfa6f 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ Default configuration can be found [here](https://github.com/FlutterGen/flutter_ flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) + # line_length: 80 # Optional # Optional integrations: @@ -184,7 +184,7 @@ targets: flutter_gen_runner: # or flutter_gen options: output: lib/build_gen/ # Optional (default: lib/gen/) - line_length: 120 # Optional (default: 80) + line_length: 120 # Optional ``` ## Available Parsers diff --git a/examples/example/pubspec.yaml b/examples/example/pubspec.yaml index f96ea056..a699e17a 100644 --- a/examples/example/pubspec.yaml +++ b/examples/example/pubspec.yaml @@ -27,7 +27,7 @@ dev_dependencies: flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) +# line_length: 80 # Optional integrations: flutter_svg: true diff --git a/examples/example_resources/pubspec.yaml b/examples/example_resources/pubspec.yaml index ce91f10a..b45c7af6 100644 --- a/examples/example_resources/pubspec.yaml +++ b/examples/example_resources/pubspec.yaml @@ -21,7 +21,6 @@ dev_dependencies: flutter_gen: output: lib/gen/ - line_length: 80 integrations: flutter_svg: true diff --git a/packages/core/lib/settings/config_default.dart b/packages/core/lib/settings/config_default.dart index 396f2a85..0f765da3 100644 --- a/packages/core/lib/settings/config_default.dart +++ b/packages/core/lib/settings/config_default.dart @@ -2,12 +2,9 @@ const configDefaultYamlContent = ''' name: UNKNOWN flutter_gen: - # Optional - output: lib/gen/ - # Optional - line_length: 80 - # Optional - parse_metadata: false + output: lib/gen/ # Optional +# line_length: 80 # Optional + parse_metadata: false # Optional # Optional integrations: @@ -17,37 +14,28 @@ flutter_gen: lottie: false assets: - # Optional - enabled: true - # Optional - outputs: - # Optional + enabled: true # Optional + outputs: # Optional # Set to true if you want this package to be a package dependency # See: https://flutter.dev/docs/development/ui/assets-and-images#from-packages - package_parameter_enabled: false - # Optional + package_parameter_enabled: false # Optional # Available values: # - camel-case # - snake-case # - dot-delimiter - style: dot-delimiter + style: dot-delimiter # Optional class_name: Assets exclude: [] fonts: - # Optional - enabled: true - # Optional - outputs: + enabled: true # Optional + outputs: # Optional class_name: FontFamily colors: - # Optional - enabled: true - # Optional - inputs: [] - # Optional - outputs: + enabled: true # Optional + inputs: [] # Optional + outputs: # Optional class_name: ColorName flutter: From 288c056acc7f127d896b387e7515a1d62a748fff Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:45:39 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Roll=20example=20dep?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/example/pubspec.yaml | 5 +++-- examples/example_resources/pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/example/pubspec.yaml b/examples/example/pubspec.yaml index a699e17a..8eaded1d 100644 --- a/examples/example/pubspec.yaml +++ b/examples/example/pubspec.yaml @@ -14,15 +14,16 @@ dependencies: flutter_svg: ^2.0.0 lottie: ^3.0.0 - rive: ^0.11.0 + rive: ^0.13.20 dev_dependencies: + lints: any flutter_test: sdk: flutter + flutter_gen_runner: path: ../../packages/runner - lints: ^2.0.0 build_runner: ^2.0.0 flutter_gen: diff --git a/examples/example_resources/pubspec.yaml b/examples/example_resources/pubspec.yaml index b45c7af6..8054c258 100644 --- a/examples/example_resources/pubspec.yaml +++ b/examples/example_resources/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter_svg: ^2.0.0 lottie: ^3.0.0 - rive: ^0.11.0 + rive: ^0.13.20 dev_dependencies: flutter_gen_runner: From 4f36c5091e53384fe54ddd672f6fb0f2e2add0a2 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:48:11 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=F0=9F=9A=80=20Read=20`formatter=20-=20pa?= =?UTF-8?q?ge=5Fwidth`=20from=20`analysis=5Foptions.yaml`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/settings/config.dart | 29 ++++++++++++++++++++++++++ packages/core/lib/utils/formatter.dart | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/packages/core/lib/settings/config.dart b/packages/core/lib/settings/config.dart index 41f1f1c6..7181a648 100644 --- a/packages/core/lib/settings/config.dart +++ b/packages/core/lib/settings/config.dart @@ -1,5 +1,7 @@ import 'dart:io'; +// import 'package:collection/collection.dart'; +// import 'package:dart_style/dart_style.dart' show TrailingCommas; import 'package:flutter_gen_core/settings/config_default.dart'; import 'package:flutter_gen_core/settings/pubspec.dart'; import 'package:flutter_gen_core/utils/cast.dart' show safeCast; @@ -16,11 +18,18 @@ class Config { required this.pubspec, required this.pubspecFile, required this.sdkConstraint, + // required this.formatterTrailingCommas, + required this.formatterPageWidth, }); final Pubspec pubspec; final File pubspecFile; final VersionConstraint? sdkConstraint; + + // TODO(ANYONE): Allow passing the trailing commas option after the SDK constraint was bumped to ^3.7. + // final TrailingCommas? formatterTrailingCommas; + + final int? formatterPageWidth; } Config loadPubspecConfig(File pubspecFile, {File? buildFile}) { @@ -102,10 +111,30 @@ Config loadPubspecConfig(File pubspecFile, {File? buildFile}) { sdkConstraint = VersionConstraint.parse(sdk); } + final analysisOptionsFile = File( + normalize(join(basename(pubspecFile.parent.path), 'analysis_options.yaml')), + ); + final analysisOptionsContent = switch (analysisOptionsFile.existsSync()) { + true => analysisOptionsFile.readAsStringSync(), + false => '', + }; + final analysisOptionsMap = loadYaml(analysisOptionsContent) as YamlMap?; + // final formatterTrailingCommas = switch (safeCast( + // analysisOptionsMap?['formatter']?['trailing_commas'], + // )) { + // final s? => TrailingCommas.values.firstWhereOrNull((e) => e.name == s), + // _ => null, + // }; + final formatterPageWidth = safeCast( + analysisOptionsMap?['formatter']?['page_width'], + ); + return Config._( pubspec: pubspec, pubspecFile: pubspecFile, sdkConstraint: sdkConstraint, + // formatterTrailingCommas: formatterTrailingCommas, + formatterPageWidth: formatterPageWidth, ); } diff --git a/packages/core/lib/utils/formatter.dart b/packages/core/lib/utils/formatter.dart index 59f8d569..a8534585 100644 --- a/packages/core/lib/utils/formatter.dart +++ b/packages/core/lib/utils/formatter.dart @@ -13,11 +13,16 @@ DartFormatter buildDartFormatterFromConfig(Config config) { sdkConstraint = VersionConstraint.parse('^$version'); } final useShort = sdkConstraint.allowsAny(VersionConstraint.parse('<3.7.0')); + + final pageWidth = + config.pubspec.flutterGen.lineLength ?? config.formatterPageWidth; + return DartFormatter( languageVersion: useShort ? DartFormatter.latestShortStyleLanguageVersion : DartFormatter.latestLanguageVersion, - pageWidth: config.pubspec.flutterGen.lineLength, + pageWidth: pageWidth, + // trailingCommas: config.formatterTrailingCommas, lineEnding: '\n', ); } From e921965a4e0a34d5a995ca10acffa310ac6214b9 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:48:24 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20lints?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/utils/map.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/lib/utils/map.dart b/packages/core/lib/utils/map.dart index 262d6b47..5cad31e0 100644 --- a/packages/core/lib/utils/map.dart +++ b/packages/core/lib/utils/map.dart @@ -1,7 +1,7 @@ // Copy from https://pub.dev/packages/merge_map /// Exposes the [mergeMap] function, which... merges Maps. -_copyValues( +void _copyValues( Map from, Map to, bool recursive, From e2a59a8cd8277b494a1e943ab6761a436ec57e52 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:50:24 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Reorg=20lint=20rules?= =?UTF-8?q?=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/generators/generator_helper.dart | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/core/lib/generators/generator_helper.dart b/packages/core/lib/generators/generator_helper.dart index 304ea9cb..7596bc1d 100644 --- a/packages/core/lib/generators/generator_helper.dart +++ b/packages/core/lib/generators/generator_helper.dart @@ -10,11 +10,18 @@ String get header { '''; } +const _ignoredRules = [ + 'deprecated_member_use', + 'directives_ordering', + 'implicit_dynamic_list_literal', + 'unnecessary_import', +]; + String get ignore { return '''// coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use - +// ignore_for_file: ${_ignoredRules.join(',')} + '''; } From 43c76062c7b282e5390e9939c85219d735862e8d Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:50:43 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E2=9C=A8=20Generate=20formatter=20page?= =?UTF-8?q?=20width=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/generators/assets_generator.dart | 1 + packages/core/lib/generators/colors_generator.dart | 1 + packages/core/lib/generators/fonts_generator.dart | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/core/lib/generators/assets_generator.dart b/packages/core/lib/generators/assets_generator.dart index cd8ddd68..26944f1e 100644 --- a/packages/core/lib/generators/assets_generator.dart +++ b/packages/core/lib/generators/assets_generator.dart @@ -145,6 +145,7 @@ Future generateAssets( } final buffer = StringBuffer(); + buffer.writeln('// dart format width=${formatter.pageWidth}\n'); buffer.writeln(header); buffer.writeln(ignore); buffer.writeln(importsBuffer.toString()); diff --git a/packages/core/lib/generators/colors_generator.dart b/packages/core/lib/generators/colors_generator.dart index 729fc105..9ebbb4c5 100644 --- a/packages/core/lib/generators/colors_generator.dart +++ b/packages/core/lib/generators/colors_generator.dart @@ -24,6 +24,7 @@ String generateColors( final buffer = StringBuffer(); final className = colorsConfig.outputs.className; + buffer.writeln('// dart format width=${formatter.pageWidth}'); buffer.writeln(header); buffer.writeln(ignore); buffer.writeln("import 'package:flutter/painting.dart';"); diff --git a/packages/core/lib/generators/fonts_generator.dart b/packages/core/lib/generators/fonts_generator.dart index ec971809..0d15cc1d 100644 --- a/packages/core/lib/generators/fonts_generator.dart +++ b/packages/core/lib/generators/fonts_generator.dart @@ -45,6 +45,7 @@ String generateFonts( final buffer = StringBuffer(); final className = fontsConfig.outputs.className; + buffer.writeln('// dart format width=${formatter.pageWidth}'); buffer.writeln(header); buffer.writeln(ignore); buffer.writeln('class $className {'); From 3566700ea05bd5a45920cefb8bbbeb7d605e0527 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 08:53:14 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=F0=9F=9A=80=20Roll=20test=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actual_data/assets_assets.gen.dart | 4 +- .../assets_assets_camel_case.gen.dart | 91 +++++++++---------- .../assets_assets_change_class_name.gen.dart | 30 +++--- .../assets_assets_directory_path.gen.dart | 40 +++----- ...ctory_path_with_package_parameter.gen.dart | 35 +++---- .../assets_assets_exclude_files.gen.dart | 21 ++--- .../assets_assets_flavored.gen.dart | 55 +++++------ ...assets_assets_lottie_integrations.gen.dart | 24 ++--- ...ssets_assets_no_image_integration.gen.dart | 4 +- .../assets_assets_no_integrations.gen.dart | 30 +++--- .../assets_assets_package_parameter.gen.dart | 35 +++---- ...age_parameter_disable_null_safety.gen.dart | 35 +++---- .../assets_assets_parse_metadata.gen.dart | 89 +++++++++--------- .../assets_assets_rive_integrations.gen.dart | 9 +- .../assets_assets_snake_case.gen.dart | 91 +++++++++---------- .../assets_assets_svg_integrations.gen.dart | 23 ++--- .../assets_change_output_path.gen.dart | 30 +++--- .../actual_data/assets_ignore_files.gen.dart | 4 +- .../actual_data/assets_normal.gen.dart | 49 ++++------ .../assets_only_flutter_value.gen.dart | 30 +++--- .../assets_unknown_mime_type.gen.dart | 4 +- .../assets_wrong_output_path.gen.dart | 30 +++--- .../build_assets_build_assets.gen.dart | 4 +- .../build_assets_build_empty.gen.dart | 4 +- .../build_assets_build_runner_assets.gen.dart | 4 +- .../colors_change_output_path.gen.dart | 75 +++++++-------- .../actual_data/colors_colors.gen.dart | 3 +- .../colors_colors_change_class_name.gen.dart | 75 +++++++-------- .../actual_data/colors_normal.gen.dart | 75 +++++++-------- .../colors_only_flutter_gen_value.gen.dart | 75 +++++++-------- .../colors_wrong_output_path.gen.dart | 75 +++++++-------- .../fonts_change_output_path.gen.dart | 3 +- .../actual_data/fonts_fonts.gen.dart | 3 +- .../fonts_fonts_change_class_name.gen.dart | 3 +- .../fonts_fonts_package_parameter.gen.dart | 3 +- .../actual_data/fonts_normal.gen.dart | 3 +- .../fonts_only_flutter_value.gen.dart | 3 +- .../fonts_wrong_output_path.gen.dart | 3 +- .../core/test_resources/pubspec_assets.yaml | 5 +- .../pubspec_assets_camel_case.yaml | 1 - .../pubspec_assets_change_class_name.yaml | 1 - .../pubspec_assets_exclude_files.yaml | 1 - .../pubspec_assets_flavored.yaml | 1 - ...bspec_assets_flavored_duplicate_entry.yaml | 1 - .../pubspec_assets_lottie_integrations.yaml | 1 - .../pubspec_assets_no_image_integration.yaml | 1 - .../pubspec_assets_no_integrations.yaml | 1 - .../pubspec_assets_no_list.yaml | 1 - .../pubspec_assets_parse_metadata.yaml | 1 - .../pubspec_assets_rive_integrations.yaml | 1 - .../pubspec_assets_snake_case.yaml | 1 - .../pubspec_assets_svg_integrations.yaml | 1 - .../core/test_resources/pubspec_colors.yaml | 4 +- .../pubspec_colors_change_class_name.yaml | 1 - .../pubspec_colors_no_inputs.yaml | 1 - .../pubspec_colors_no_inputs_list.yaml | 1 - .../core/test_resources/pubspec_fonts.yaml | 4 +- .../pubspec_fonts_change_class_name.yaml | 1 - .../pubspec_fonts_no_family.yaml | 1 - .../pubspec_fonts_package_parameter.yaml | 1 - .../test_resources/pubspec_ignore_files.yaml | 1 - .../core/test_resources/pubspec_normal.yaml | 4 +- .../pubspec_only_flutter_gen_value.yaml | 1 - .../pubspec_unknown_mime_type.yaml | 1 - .../pubspec_wrong_output_path.yaml | 1 - 65 files changed, 547 insertions(+), 667 deletions(-) diff --git a/packages/core/test_resources/actual_data/assets_assets.gen.dart b/packages/core/test_resources/actual_data/assets_assets.gen.dart index ef265e5f..c7de4f8b 100644 --- a/packages/core/test_resources/actual_data/assets_assets.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/core/test_resources/actual_data/assets_assets_camel_case.gen.dart b/packages/core/test_resources/actual_data/assets_assets_camel_case.gen.dart index 55d4e167..c97a1d68 100644 --- a/packages/core/test_resources/actual_data/assets_assets_camel_case.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_camel_case.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -13,20 +15,24 @@ class Assets { const Assets._(); /// File path: assets/images/chip1.jpg - static const AssetGenImage imagesChip1 = - AssetGenImage('assets/images/chip1.jpg'); + static const AssetGenImage imagesChip1 = AssetGenImage( + 'assets/images/chip1.jpg', + ); /// File path: assets/images/chip2.jpg - static const AssetGenImage imagesChip2 = - AssetGenImage('assets/images/chip2.jpg'); + static const AssetGenImage imagesChip2 = AssetGenImage( + 'assets/images/chip2.jpg', + ); /// File path: assets/images/chip3/chip3.jpg - static const AssetGenImage imagesChip3Chip3 = - AssetGenImage('assets/images/chip3/chip3.jpg'); + static const AssetGenImage imagesChip3Chip3 = AssetGenImage( + 'assets/images/chip3/chip3.jpg', + ); /// File path: assets/images/chip4/chip4.jpg - static const AssetGenImage imagesChip4Chip4 = - AssetGenImage('assets/images/chip4/chip4.jpg'); + static const AssetGenImage imagesChip4Chip4 = AssetGenImage( + 'assets/images/chip4/chip4.jpg', + ); /// File path: assets/images/icons/dart@test.svg static const String imagesIconsDartTest = 'assets/images/icons/dart@test.svg'; @@ -41,16 +47,19 @@ class Assets { static const String imagesIconsPaint = 'assets/images/icons/paint.svg'; /// File path: assets/images/logo.png - static const AssetGenImage imagesLogo = - AssetGenImage('assets/images/logo.png'); + static const AssetGenImage imagesLogo = AssetGenImage( + 'assets/images/logo.png', + ); /// File path: assets/images/profile.jpg - static const AssetGenImage imagesProfileJpg = - AssetGenImage('assets/images/profile.jpg'); + static const AssetGenImage imagesProfileJpg = AssetGenImage( + 'assets/images/profile.jpg', + ); /// File path: assets/images/profile.png - static const AssetGenImage imagesProfilePng = - AssetGenImage('assets/images/profile.png'); + static const AssetGenImage imagesProfilePng = AssetGenImage( + 'assets/images/profile.png', + ); /// File path: assets/json/list.json static const String jsonList = 'assets/json/list.json'; @@ -59,34 +68,31 @@ class Assets { static const String jsonMap = 'assets/json/map.json'; /// File path: pictures/chip5.jpg - static const AssetGenImage picturesChip5 = - AssetGenImage('pictures/chip5.jpg'); + static const AssetGenImage picturesChip5 = AssetGenImage( + 'pictures/chip5.jpg', + ); /// List of all assets static List get values => [ - imagesChip1, - imagesChip2, - imagesChip3Chip3, - imagesChip4Chip4, - imagesIconsDartTest, - imagesIconsFuchsia, - imagesIconsKmm, - imagesIconsPaint, - imagesLogo, - imagesProfileJpg, - imagesProfilePng, - jsonList, - jsonMap, - picturesChip5 - ]; + imagesChip1, + imagesChip2, + imagesChip3Chip3, + imagesChip4Chip4, + imagesIconsDartTest, + imagesIconsFuchsia, + imagesIconsKmm, + imagesIconsPaint, + imagesLogo, + imagesProfileJpg, + imagesProfilePng, + jsonList, + jsonMap, + picturesChip5, + ]; } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -146,15 +152,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/assets_assets_change_class_name.gen.dart b/packages/core/test_resources/actual_data/assets_assets_change_class_name.gen.dart index cb88beb3..4ad5c909 100644 --- a/packages/core/test_resources/actual_data/assets_assets_change_class_name.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_change_class_name.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -30,8 +32,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class MyAssets { @@ -41,11 +48,7 @@ class MyAssets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -105,15 +108,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/assets_assets_directory_path.gen.dart b/packages/core/test_resources/actual_data/assets_assets_directory_path.gen.dart index 3c8b8d63..6b9b4d5c 100644 --- a/packages/core/test_resources/actual_data/assets_assets_directory_path.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_directory_path.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -78,11 +80,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -142,15 +140,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; @@ -159,17 +150,11 @@ class AssetGenImage { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -225,7 +210,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_assets_directory_path_with_package_parameter.gen.dart b/packages/core/test_resources/actual_data/assets_assets_directory_path_with_package_parameter.gen.dart index dac150f8..d293d5de 100644 --- a/packages/core/test_resources/actual_data/assets_assets_directory_path_with_package_parameter.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_directory_path_with_package_parameter.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -81,11 +83,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -153,11 +151,7 @@ class AssetGenImage { @Deprecated('Do not specify package for a generated library asset') String? package = package, }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; @@ -166,17 +160,11 @@ class AssetGenImage { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -235,7 +223,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_assets_exclude_files.gen.dart b/packages/core/test_resources/actual_data/assets_assets_exclude_files.gen.dart index 9de8dd65..43af0f0a 100644 --- a/packages/core/test_resources/actual_data/assets_assets_exclude_files.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_exclude_files.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -71,11 +73,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -135,15 +133,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/assets_assets_flavored.gen.dart b/packages/core/test_resources/actual_data/assets_assets_flavored.gen.dart index e82ab501..09485c80 100644 --- a/packages/core/test_resources/actual_data/assets_assets_flavored.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_flavored.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -62,8 +64,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class $AssetsJsonGen { @@ -114,10 +121,8 @@ class $AssetsImagesChip4Gen { const $AssetsImagesChip4Gen(); /// File path: assets/images/chip4/chip4.jpg - AssetGenImage get chip4 => const AssetGenImage( - 'assets/images/chip4/chip4.jpg', - flavors: {'test'}, - ); + AssetGenImage get chip4 => + const AssetGenImage('assets/images/chip4/chip4.jpg', flavors: {'test'}); /// List of all assets List get values => [chip4]; @@ -160,11 +165,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -224,15 +225,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; @@ -241,17 +235,11 @@ class AssetGenImage { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -307,7 +295,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_assets_lottie_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_assets_lottie_integrations.gen.dart index 1c2793be..4f1c44a3 100644 --- a/packages/core/test_resources/actual_data/assets_assets_lottie_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_lottie_integrations.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; import 'package:lottie/lottie.dart' as _lottie; @@ -30,8 +32,12 @@ class $AssetsLottieGen { const LottieGenImage('assets/lottie/spinning_carrousel.zip'); /// List of all assets - List get values => - [xuiIZ9X1Rf, catCat, hamburgerArrow, spinningCarrousel]; + List get values => [ + xuiIZ9X1Rf, + catCat, + hamburgerArrow, + spinningCarrousel, + ]; } class Assets { @@ -41,10 +47,7 @@ class Assets { } class LottieGenImage { - const LottieGenImage( - this._assetName, { - this.flavors = const {}, - }); + const LottieGenImage(this._assetName, {this.flavors = const {}}); final String _assetName; final Set flavors; @@ -61,11 +64,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, diff --git a/packages/core/test_resources/actual_data/assets_assets_no_image_integration.gen.dart b/packages/core/test_resources/actual_data/assets_assets_no_image_integration.gen.dart index ae0c5c0d..dc446627 100644 --- a/packages/core/test_resources/actual_data/assets_assets_no_image_integration.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_no_image_integration.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class $PicturesGen { const $PicturesGen(); diff --git a/packages/core/test_resources/actual_data/assets_assets_no_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_assets_no_integrations.gen.dart index 619b60a8..18526b10 100644 --- a/packages/core/test_resources/actual_data/assets_assets_no_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_no_integrations.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -49,8 +51,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class $AssetsJsonGen { @@ -116,11 +123,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -180,15 +183,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/assets_assets_package_parameter.gen.dart b/packages/core/test_resources/actual_data/assets_assets_package_parameter.gen.dart index b5cc829f..3a9dc248 100644 --- a/packages/core/test_resources/actual_data/assets_assets_package_parameter.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_package_parameter.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -69,11 +71,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -141,11 +139,7 @@ class AssetGenImage { @Deprecated('Do not specify package for a generated library asset') String? package = package, }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; @@ -154,17 +148,11 @@ class AssetGenImage { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -223,7 +211,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_assets_package_parameter_disable_null_safety.gen.dart b/packages/core/test_resources/actual_data/assets_assets_package_parameter_disable_null_safety.gen.dart index 612882dd..afdfe1c6 100644 --- a/packages/core/test_resources/actual_data/assets_assets_package_parameter_disable_null_safety.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_package_parameter_disable_null_safety.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -57,11 +59,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -129,11 +127,7 @@ class AssetGenImage { @Deprecated('Do not specify package for a generated library asset') String? package = package, }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; @@ -142,17 +136,11 @@ class AssetGenImage { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -211,7 +199,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_assets_parse_metadata.gen.dart b/packages/core/test_resources/actual_data/assets_assets_parse_metadata.gen.dart index a991a711..951c8226 100644 --- a/packages/core/test_resources/actual_data/assets_assets_parse_metadata.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_parse_metadata.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -65,8 +67,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class $AssetsJsonGen { @@ -106,9 +113,10 @@ class $AssetsImagesChip3Gen { const $AssetsImagesChip3Gen(); /// File path: assets/images/chip3/chip3.jpg - AssetGenImage get chip3 => - const AssetGenImage('assets/images/chip3/chip3.jpg', - size: Size(600.0, 403.0)); + AssetGenImage get chip3 => const AssetGenImage( + 'assets/images/chip3/chip3.jpg', + size: Size(600.0, 403.0), + ); /// List of all assets List get values => [chip3]; @@ -118,9 +126,10 @@ class $AssetsImagesChip4Gen { const $AssetsImagesChip4Gen(); /// File path: assets/images/chip4/chip4.jpg - AssetGenImage get chip4 => - const AssetGenImage('assets/images/chip4/chip4.jpg', - size: Size(600.0, 403.0)); + AssetGenImage get chip4 => const AssetGenImage( + 'assets/images/chip4/chip4.jpg', + size: Size(600.0, 403.0), + ); /// List of all assets List get values => [chip4]; @@ -130,26 +139,32 @@ class $AssetsImagesIconsGen { const $AssetsImagesIconsGen(); /// File path: assets/images/icons/dart@test.svg - SvgGenImage get dartTest => - const SvgGenImage('assets/images/icons/dart@test.svg', - size: Size(512.001, 512.001)); + SvgGenImage get dartTest => const SvgGenImage( + 'assets/images/icons/dart@test.svg', + size: Size(512.001, 512.001), + ); /// File path: assets/images/icons/fuchsia.svg - SvgGenImage get fuchsia => - const SvgGenImage('assets/images/icons/fuchsia.svg', - size: Size(50.0, 50.0)); + SvgGenImage get fuchsia => const SvgGenImage( + 'assets/images/icons/fuchsia.svg', + size: Size(50.0, 50.0), + ); /// File path: assets/images/icons/invalid.svg SvgGenImage get invalid => const SvgGenImage('assets/images/icons/invalid.svg'); /// File path: assets/images/icons/kmm.svg - SvgGenImage get kmm => const SvgGenImage('assets/images/icons/kmm.svg', - size: Size(755.0, 310.0)); + SvgGenImage get kmm => const SvgGenImage( + 'assets/images/icons/kmm.svg', + size: Size(755.0, 310.0), + ); /// File path: assets/images/icons/paint.svg - SvgGenImage get paint => const SvgGenImage('assets/images/icons/paint.svg', - size: Size(472.0, 392.0)); + SvgGenImage get paint => const SvgGenImage( + 'assets/images/icons/paint.svg', + size: Size(472.0, 392.0), + ); /// List of all assets List get values => [dartTest, fuchsia, invalid, kmm, paint]; @@ -167,11 +182,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -231,15 +242,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; @@ -248,17 +252,11 @@ class AssetGenImage { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -314,7 +312,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_assets_rive_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_assets_rive_integrations.gen.dart index 39421014..b78e23ee 100644 --- a/packages/core/test_resources/actual_data/assets_assets_rive_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_rive_integrations.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; import 'package:rive/rive.dart' as _rive; @@ -27,10 +29,7 @@ class Assets { } class RiveGenImage { - const RiveGenImage( - this._assetName, { - this.flavors = const {}, - }); + const RiveGenImage(this._assetName, {this.flavors = const {}}); final String _assetName; final Set flavors; diff --git a/packages/core/test_resources/actual_data/assets_assets_snake_case.gen.dart b/packages/core/test_resources/actual_data/assets_assets_snake_case.gen.dart index e6c001da..0a13edb4 100644 --- a/packages/core/test_resources/actual_data/assets_assets_snake_case.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_snake_case.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -13,20 +15,24 @@ class Assets { const Assets._(); /// File path: assets/images/chip1.jpg - static const AssetGenImage images_chip1 = - AssetGenImage('assets/images/chip1.jpg'); + static const AssetGenImage images_chip1 = AssetGenImage( + 'assets/images/chip1.jpg', + ); /// File path: assets/images/chip2.jpg - static const AssetGenImage images_chip2 = - AssetGenImage('assets/images/chip2.jpg'); + static const AssetGenImage images_chip2 = AssetGenImage( + 'assets/images/chip2.jpg', + ); /// File path: assets/images/chip3/chip3.jpg - static const AssetGenImage images_chip3_chip3 = - AssetGenImage('assets/images/chip3/chip3.jpg'); + static const AssetGenImage images_chip3_chip3 = AssetGenImage( + 'assets/images/chip3/chip3.jpg', + ); /// File path: assets/images/chip4/chip4.jpg - static const AssetGenImage images_chip4_chip4 = - AssetGenImage('assets/images/chip4/chip4.jpg'); + static const AssetGenImage images_chip4_chip4 = AssetGenImage( + 'assets/images/chip4/chip4.jpg', + ); /// File path: assets/images/icons/dart@test.svg static const String images_icons_dart_test = @@ -42,16 +48,19 @@ class Assets { static const String images_icons_paint = 'assets/images/icons/paint.svg'; /// File path: assets/images/logo.png - static const AssetGenImage images_logo = - AssetGenImage('assets/images/logo.png'); + static const AssetGenImage images_logo = AssetGenImage( + 'assets/images/logo.png', + ); /// File path: assets/images/profile.jpg - static const AssetGenImage images_profile_jpg = - AssetGenImage('assets/images/profile.jpg'); + static const AssetGenImage images_profile_jpg = AssetGenImage( + 'assets/images/profile.jpg', + ); /// File path: assets/images/profile.png - static const AssetGenImage images_profile_png = - AssetGenImage('assets/images/profile.png'); + static const AssetGenImage images_profile_png = AssetGenImage( + 'assets/images/profile.png', + ); /// File path: assets/json/list.json static const String json_list = 'assets/json/list.json'; @@ -60,34 +69,31 @@ class Assets { static const String json_map = 'assets/json/map.json'; /// File path: pictures/chip5.jpg - static const AssetGenImage pictures_chip5 = - AssetGenImage('pictures/chip5.jpg'); + static const AssetGenImage pictures_chip5 = AssetGenImage( + 'pictures/chip5.jpg', + ); /// List of all assets static List get values => [ - images_chip1, - images_chip2, - images_chip3_chip3, - images_chip4_chip4, - images_icons_dart_test, - images_icons_fuchsia, - images_icons_kmm, - images_icons_paint, - images_logo, - images_profile_jpg, - images_profile_png, - json_list, - json_map, - pictures_chip5 - ]; + images_chip1, + images_chip2, + images_chip3_chip3, + images_chip4_chip4, + images_icons_dart_test, + images_icons_fuchsia, + images_icons_kmm, + images_icons_paint, + images_logo, + images_profile_jpg, + images_profile_png, + json_list, + json_map, + pictures_chip5, + ]; } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -147,15 +153,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/assets_assets_svg_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_assets_svg_integrations.gen.dart index 7f69e593..c7056513 100644 --- a/packages/core/test_resources/actual_data/assets_assets_svg_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_assets_svg_integrations.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -44,17 +46,11 @@ class Assets { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -110,7 +106,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_change_output_path.gen.dart b/packages/core/test_resources/actual_data/assets_change_output_path.gen.dart index ed1a50c5..fba2ca3c 100644 --- a/packages/core/test_resources/actual_data/assets_change_output_path.gen.dart +++ b/packages/core/test_resources/actual_data/assets_change_output_path.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -30,8 +32,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class Assets { @@ -41,11 +48,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -105,15 +108,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/assets_ignore_files.gen.dart b/packages/core/test_resources/actual_data/assets_ignore_files.gen.dart index f327f1bf..bb00bfdb 100644 --- a/packages/core/test_resources/actual_data/assets_ignore_files.gen.dart +++ b/packages/core/test_resources/actual_data/assets_ignore_files.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class $AssetsUnknownGen { const $AssetsUnknownGen(); diff --git a/packages/core/test_resources/actual_data/assets_normal.gen.dart b/packages/core/test_resources/actual_data/assets_normal.gen.dart index bd0df38c..ec34a2f8 100644 --- a/packages/core/test_resources/actual_data/assets_normal.gen.dart +++ b/packages/core/test_resources/actual_data/assets_normal.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -52,8 +54,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class $AssetsJsonGen { @@ -121,11 +128,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -185,15 +188,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; @@ -202,17 +198,11 @@ class AssetGenImage { } class SvgGenImage { - 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(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = false; + + const SvgGenImage.vec(this._assetName, {this.size, this.flavors = const {}}) + : _isVecFormat = true; final String _assetName; final Size? size; @@ -268,7 +258,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? + colorFilter: + colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, diff --git a/packages/core/test_resources/actual_data/assets_only_flutter_value.gen.dart b/packages/core/test_resources/actual_data/assets_only_flutter_value.gen.dart index ed1a50c5..fba2ca3c 100644 --- a/packages/core/test_resources/actual_data/assets_only_flutter_value.gen.dart +++ b/packages/core/test_resources/actual_data/assets_only_flutter_value.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -30,8 +32,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class Assets { @@ -41,11 +48,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -105,15 +108,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/assets_unknown_mime_type.gen.dart b/packages/core/test_resources/actual_data/assets_unknown_mime_type.gen.dart index 04a7edfd..fb36bdf1 100644 --- a/packages/core/test_resources/actual_data/assets_unknown_mime_type.gen.dart +++ b/packages/core/test_resources/actual_data/assets_unknown_mime_type.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class $AssetsUnknownGen { const $AssetsUnknownGen(); diff --git a/packages/core/test_resources/actual_data/assets_wrong_output_path.gen.dart b/packages/core/test_resources/actual_data/assets_wrong_output_path.gen.dart index ed1a50c5..fba2ca3c 100644 --- a/packages/core/test_resources/actual_data/assets_wrong_output_path.gen.dart +++ b/packages/core/test_resources/actual_data/assets_wrong_output_path.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/widgets.dart'; @@ -30,8 +32,13 @@ class $AssetsImagesGen { const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => - [chip1, chip2, logo, profileJpg, profilePng]; + List get values => [ + chip1, + chip2, + logo, + profileJpg, + profilePng, + ]; } class Assets { @@ -41,11 +48,7 @@ class Assets { } class AssetGenImage { - const AssetGenImage( - this._assetName, { - this.size, - this.flavors = const {}, - }); + const AssetGenImage(this._assetName, {this.size, this.flavors = const {}}); final String _assetName; @@ -105,15 +108,8 @@ class AssetGenImage { ); } - ImageProvider provider({ - AssetBundle? bundle, - String? package, - }) { - return AssetImage( - _assetName, - bundle: bundle, - package: package, - ); + ImageProvider provider({AssetBundle? bundle, String? package}) { + return AssetImage(_assetName, bundle: bundle, package: package); } String get path => _assetName; diff --git a/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart b/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart index 76b5439a..ff4bf2d7 100644 --- a/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart +++ b/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart @@ -1,3 +1,5 @@ +// dart format width=120 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/core/test_resources/actual_data/build_assets_build_empty.gen.dart b/packages/core/test_resources/actual_data/build_assets_build_empty.gen.dart index ef265e5f..c7de4f8b 100644 --- a/packages/core/test_resources/actual_data/build_assets_build_empty.gen.dart +++ b/packages/core/test_resources/actual_data/build_assets_build_empty.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/core/test_resources/actual_data/build_assets_build_runner_assets.gen.dart b/packages/core/test_resources/actual_data/build_assets_build_runner_assets.gen.dart index 19ecaaf9..2ae57990 100644 --- a/packages/core/test_resources/actual_data/build_assets_build_runner_assets.gen.dart +++ b/packages/core/test_resources/actual_data/build_assets_build_runner_assets.gen.dart @@ -1,3 +1,5 @@ +// dart format width=120 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/core/test_resources/actual_data/colors_change_output_path.gen.dart b/packages/core/test_resources/actual_data/colors_change_output_path.gen.dart index 34165460..8961e3c1 100644 --- a/packages/core/test_resources/actual_data/colors_change_output_path.gen.dart +++ b/packages/core/test_resources/actual_data/colors_change_output_path.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; @@ -27,21 +28,19 @@ class ColorName { /// 700: #FFC31F1F /// 800: #FFBD1919 /// 900: #FFB20F0F - static const MaterialColor crimsonRed = MaterialColor( - 0xFFCF2A2A, - { - 50: Color(0xFFF9E5E5), - 100: Color(0xFFF1BFBF), - 200: Color(0xFFE79595), - 300: Color(0xFFDD6A6A), - 400: Color(0xFFD64A4A), - 500: Color(0xFFCF2A2A), - 600: Color(0xFFCA2525), - 700: Color(0xFFC31F1F), - 800: Color(0xFFBD1919), - 900: Color(0xFFB20F0F), - }, - ); + static const MaterialColor crimsonRed = + MaterialColor(0xFFCF2A2A, { + 50: Color(0xFFF9E5E5), + 100: Color(0xFFF1BFBF), + 200: Color(0xFFE79595), + 300: Color(0xFFDD6A6A), + 400: Color(0xFFD64A4A), + 500: Color(0xFFCF2A2A), + 600: Color(0xFFCA2525), + 700: Color(0xFFC31F1F), + 800: Color(0xFFBD1919), + 900: Color(0xFFB20F0F), + }); /// Color: #979797 static const Color gray410 = Color(0xFF979797); @@ -63,34 +62,30 @@ class ColorName { /// 700: #FFD7821D /// 800: #FFD27817 /// 900: #FFCA670E - static const MaterialColor yellowOcher = MaterialColor( - 0xFFDF9527, - { - 50: Color(0xFFFBF2E5), - 100: Color(0xFFF5DFBE), - 200: Color(0xFFEFCA93), - 300: Color(0xFFE9B568), - 400: Color(0xFFE4A547), - 500: Color(0xFFDF9527), - 600: Color(0xFFDB8D23), - 700: Color(0xFFD7821D), - 800: Color(0xFFD27817), - 900: Color(0xFFCA670E), - }, - ); + static const MaterialColor yellowOcher = + MaterialColor(0xFFDF9527, { + 50: Color(0xFFFBF2E5), + 100: Color(0xFFF5DFBE), + 200: Color(0xFFEFCA93), + 300: Color(0xFFE9B568), + 400: Color(0xFFE4A547), + 500: Color(0xFFDF9527), + 600: Color(0xFFDB8D23), + 700: Color(0xFFD7821D), + 800: Color(0xFFD27817), + 900: Color(0xFFCA670E), + }); /// MaterialAccentColor: /// 100: #FFFFE8E0 /// 200: #FFFFBCA3 /// 400: #FFFFA989 /// 700: #FFFF9E7A - static const MaterialAccentColor yellowOcherAccent = MaterialAccentColor( - 0xFFFFBCA3, - { - 100: Color(0xFFFFE8E0), - 200: Color(0xFFFFBCA3), - 400: Color(0xFFFFA989), - 700: Color(0xFFFF9E7A), - }, - ); + static const MaterialAccentColor yellowOcherAccent = + MaterialAccentColor(0xFFFFBCA3, { + 100: Color(0xFFFFE8E0), + 200: Color(0xFFFFBCA3), + 400: Color(0xFFFFA989), + 700: Color(0xFFFF9E7A), + }); } diff --git a/packages/core/test_resources/actual_data/colors_colors.gen.dart b/packages/core/test_resources/actual_data/colors_colors.gen.dart index f355a5b6..94cedd96 100644 --- a/packages/core/test_resources/actual_data/colors_colors.gen.dart +++ b/packages/core/test_resources/actual_data/colors_colors.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; diff --git a/packages/core/test_resources/actual_data/colors_colors_change_class_name.gen.dart b/packages/core/test_resources/actual_data/colors_colors_change_class_name.gen.dart index 81eeae43..d945ba29 100644 --- a/packages/core/test_resources/actual_data/colors_colors_change_class_name.gen.dart +++ b/packages/core/test_resources/actual_data/colors_colors_change_class_name.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; @@ -27,21 +28,19 @@ class MyColorName { /// 700: #FFC31F1F /// 800: #FFBD1919 /// 900: #FFB20F0F - static const MaterialColor crimsonRed = MaterialColor( - 0xFFCF2A2A, - { - 50: Color(0xFFF9E5E5), - 100: Color(0xFFF1BFBF), - 200: Color(0xFFE79595), - 300: Color(0xFFDD6A6A), - 400: Color(0xFFD64A4A), - 500: Color(0xFFCF2A2A), - 600: Color(0xFFCA2525), - 700: Color(0xFFC31F1F), - 800: Color(0xFFBD1919), - 900: Color(0xFFB20F0F), - }, - ); + static const MaterialColor crimsonRed = + MaterialColor(0xFFCF2A2A, { + 50: Color(0xFFF9E5E5), + 100: Color(0xFFF1BFBF), + 200: Color(0xFFE79595), + 300: Color(0xFFDD6A6A), + 400: Color(0xFFD64A4A), + 500: Color(0xFFCF2A2A), + 600: Color(0xFFCA2525), + 700: Color(0xFFC31F1F), + 800: Color(0xFFBD1919), + 900: Color(0xFFB20F0F), + }); /// Color: #979797 static const Color gray410 = Color(0xFF979797); @@ -63,34 +62,30 @@ class MyColorName { /// 700: #FFD7821D /// 800: #FFD27817 /// 900: #FFCA670E - static const MaterialColor yellowOcher = MaterialColor( - 0xFFDF9527, - { - 50: Color(0xFFFBF2E5), - 100: Color(0xFFF5DFBE), - 200: Color(0xFFEFCA93), - 300: Color(0xFFE9B568), - 400: Color(0xFFE4A547), - 500: Color(0xFFDF9527), - 600: Color(0xFFDB8D23), - 700: Color(0xFFD7821D), - 800: Color(0xFFD27817), - 900: Color(0xFFCA670E), - }, - ); + static const MaterialColor yellowOcher = + MaterialColor(0xFFDF9527, { + 50: Color(0xFFFBF2E5), + 100: Color(0xFFF5DFBE), + 200: Color(0xFFEFCA93), + 300: Color(0xFFE9B568), + 400: Color(0xFFE4A547), + 500: Color(0xFFDF9527), + 600: Color(0xFFDB8D23), + 700: Color(0xFFD7821D), + 800: Color(0xFFD27817), + 900: Color(0xFFCA670E), + }); /// MaterialAccentColor: /// 100: #FFFFE8E0 /// 200: #FFFFBCA3 /// 400: #FFFFA989 /// 700: #FFFF9E7A - static const MaterialAccentColor yellowOcherAccent = MaterialAccentColor( - 0xFFFFBCA3, - { - 100: Color(0xFFFFE8E0), - 200: Color(0xFFFFBCA3), - 400: Color(0xFFFFA989), - 700: Color(0xFFFF9E7A), - }, - ); + static const MaterialAccentColor yellowOcherAccent = + MaterialAccentColor(0xFFFFBCA3, { + 100: Color(0xFFFFE8E0), + 200: Color(0xFFFFBCA3), + 400: Color(0xFFFFA989), + 700: Color(0xFFFF9E7A), + }); } diff --git a/packages/core/test_resources/actual_data/colors_normal.gen.dart b/packages/core/test_resources/actual_data/colors_normal.gen.dart index f355a5b6..57e03145 100644 --- a/packages/core/test_resources/actual_data/colors_normal.gen.dart +++ b/packages/core/test_resources/actual_data/colors_normal.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; @@ -39,21 +40,19 @@ class ColorName { /// 700: #FFC31F1F /// 800: #FFBD1919 /// 900: #FFB20F0F - static const MaterialColor crimsonRed = MaterialColor( - 0xFFCF2A2A, - { - 50: Color(0xFFF9E5E5), - 100: Color(0xFFF1BFBF), - 200: Color(0xFFE79595), - 300: Color(0xFFDD6A6A), - 400: Color(0xFFD64A4A), - 500: Color(0xFFCF2A2A), - 600: Color(0xFFCA2525), - 700: Color(0xFFC31F1F), - 800: Color(0xFFBD1919), - 900: Color(0xFFB20F0F), - }, - ); + static const MaterialColor crimsonRed = + MaterialColor(0xFFCF2A2A, { + 50: Color(0xFFF9E5E5), + 100: Color(0xFFF1BFBF), + 200: Color(0xFFE79595), + 300: Color(0xFFDD6A6A), + 400: Color(0xFFD64A4A), + 500: Color(0xFFCF2A2A), + 600: Color(0xFFCA2525), + 700: Color(0xFFC31F1F), + 800: Color(0xFFBD1919), + 900: Color(0xFFB20F0F), + }); /// Color: #979797 static const Color gray410 = Color(0xFF979797); @@ -75,34 +74,30 @@ class ColorName { /// 700: #FFD7821D /// 800: #FFD27817 /// 900: #FFCA670E - static const MaterialColor yellowOcher = MaterialColor( - 0xFFDF9527, - { - 50: Color(0xFFFBF2E5), - 100: Color(0xFFF5DFBE), - 200: Color(0xFFEFCA93), - 300: Color(0xFFE9B568), - 400: Color(0xFFE4A547), - 500: Color(0xFFDF9527), - 600: Color(0xFFDB8D23), - 700: Color(0xFFD7821D), - 800: Color(0xFFD27817), - 900: Color(0xFFCA670E), - }, - ); + static const MaterialColor yellowOcher = + MaterialColor(0xFFDF9527, { + 50: Color(0xFFFBF2E5), + 100: Color(0xFFF5DFBE), + 200: Color(0xFFEFCA93), + 300: Color(0xFFE9B568), + 400: Color(0xFFE4A547), + 500: Color(0xFFDF9527), + 600: Color(0xFFDB8D23), + 700: Color(0xFFD7821D), + 800: Color(0xFFD27817), + 900: Color(0xFFCA670E), + }); /// MaterialAccentColor: /// 100: #FFFFE8E0 /// 200: #FFFFBCA3 /// 400: #FFFFA989 /// 700: #FFFF9E7A - static const MaterialAccentColor yellowOcherAccent = MaterialAccentColor( - 0xFFFFBCA3, - { - 100: Color(0xFFFFE8E0), - 200: Color(0xFFFFBCA3), - 400: Color(0xFFFFA989), - 700: Color(0xFFFF9E7A), - }, - ); + static const MaterialAccentColor yellowOcherAccent = + MaterialAccentColor(0xFFFFBCA3, { + 100: Color(0xFFFFE8E0), + 200: Color(0xFFFFBCA3), + 400: Color(0xFFFFA989), + 700: Color(0xFFFF9E7A), + }); } diff --git a/packages/core/test_resources/actual_data/colors_only_flutter_gen_value.gen.dart b/packages/core/test_resources/actual_data/colors_only_flutter_gen_value.gen.dart index 34165460..8961e3c1 100644 --- a/packages/core/test_resources/actual_data/colors_only_flutter_gen_value.gen.dart +++ b/packages/core/test_resources/actual_data/colors_only_flutter_gen_value.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; @@ -27,21 +28,19 @@ class ColorName { /// 700: #FFC31F1F /// 800: #FFBD1919 /// 900: #FFB20F0F - static const MaterialColor crimsonRed = MaterialColor( - 0xFFCF2A2A, - { - 50: Color(0xFFF9E5E5), - 100: Color(0xFFF1BFBF), - 200: Color(0xFFE79595), - 300: Color(0xFFDD6A6A), - 400: Color(0xFFD64A4A), - 500: Color(0xFFCF2A2A), - 600: Color(0xFFCA2525), - 700: Color(0xFFC31F1F), - 800: Color(0xFFBD1919), - 900: Color(0xFFB20F0F), - }, - ); + static const MaterialColor crimsonRed = + MaterialColor(0xFFCF2A2A, { + 50: Color(0xFFF9E5E5), + 100: Color(0xFFF1BFBF), + 200: Color(0xFFE79595), + 300: Color(0xFFDD6A6A), + 400: Color(0xFFD64A4A), + 500: Color(0xFFCF2A2A), + 600: Color(0xFFCA2525), + 700: Color(0xFFC31F1F), + 800: Color(0xFFBD1919), + 900: Color(0xFFB20F0F), + }); /// Color: #979797 static const Color gray410 = Color(0xFF979797); @@ -63,34 +62,30 @@ class ColorName { /// 700: #FFD7821D /// 800: #FFD27817 /// 900: #FFCA670E - static const MaterialColor yellowOcher = MaterialColor( - 0xFFDF9527, - { - 50: Color(0xFFFBF2E5), - 100: Color(0xFFF5DFBE), - 200: Color(0xFFEFCA93), - 300: Color(0xFFE9B568), - 400: Color(0xFFE4A547), - 500: Color(0xFFDF9527), - 600: Color(0xFFDB8D23), - 700: Color(0xFFD7821D), - 800: Color(0xFFD27817), - 900: Color(0xFFCA670E), - }, - ); + static const MaterialColor yellowOcher = + MaterialColor(0xFFDF9527, { + 50: Color(0xFFFBF2E5), + 100: Color(0xFFF5DFBE), + 200: Color(0xFFEFCA93), + 300: Color(0xFFE9B568), + 400: Color(0xFFE4A547), + 500: Color(0xFFDF9527), + 600: Color(0xFFDB8D23), + 700: Color(0xFFD7821D), + 800: Color(0xFFD27817), + 900: Color(0xFFCA670E), + }); /// MaterialAccentColor: /// 100: #FFFFE8E0 /// 200: #FFFFBCA3 /// 400: #FFFFA989 /// 700: #FFFF9E7A - static const MaterialAccentColor yellowOcherAccent = MaterialAccentColor( - 0xFFFFBCA3, - { - 100: Color(0xFFFFE8E0), - 200: Color(0xFFFFBCA3), - 400: Color(0xFFFFA989), - 700: Color(0xFFFF9E7A), - }, - ); + static const MaterialAccentColor yellowOcherAccent = + MaterialAccentColor(0xFFFFBCA3, { + 100: Color(0xFFFFE8E0), + 200: Color(0xFFFFBCA3), + 400: Color(0xFFFFA989), + 700: Color(0xFFFF9E7A), + }); } diff --git a/packages/core/test_resources/actual_data/colors_wrong_output_path.gen.dart b/packages/core/test_resources/actual_data/colors_wrong_output_path.gen.dart index 34165460..8961e3c1 100644 --- a/packages/core/test_resources/actual_data/colors_wrong_output_path.gen.dart +++ b/packages/core/test_resources/actual_data/colors_wrong_output_path.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; @@ -27,21 +28,19 @@ class ColorName { /// 700: #FFC31F1F /// 800: #FFBD1919 /// 900: #FFB20F0F - static const MaterialColor crimsonRed = MaterialColor( - 0xFFCF2A2A, - { - 50: Color(0xFFF9E5E5), - 100: Color(0xFFF1BFBF), - 200: Color(0xFFE79595), - 300: Color(0xFFDD6A6A), - 400: Color(0xFFD64A4A), - 500: Color(0xFFCF2A2A), - 600: Color(0xFFCA2525), - 700: Color(0xFFC31F1F), - 800: Color(0xFFBD1919), - 900: Color(0xFFB20F0F), - }, - ); + static const MaterialColor crimsonRed = + MaterialColor(0xFFCF2A2A, { + 50: Color(0xFFF9E5E5), + 100: Color(0xFFF1BFBF), + 200: Color(0xFFE79595), + 300: Color(0xFFDD6A6A), + 400: Color(0xFFD64A4A), + 500: Color(0xFFCF2A2A), + 600: Color(0xFFCA2525), + 700: Color(0xFFC31F1F), + 800: Color(0xFFBD1919), + 900: Color(0xFFB20F0F), + }); /// Color: #979797 static const Color gray410 = Color(0xFF979797); @@ -63,34 +62,30 @@ class ColorName { /// 700: #FFD7821D /// 800: #FFD27817 /// 900: #FFCA670E - static const MaterialColor yellowOcher = MaterialColor( - 0xFFDF9527, - { - 50: Color(0xFFFBF2E5), - 100: Color(0xFFF5DFBE), - 200: Color(0xFFEFCA93), - 300: Color(0xFFE9B568), - 400: Color(0xFFE4A547), - 500: Color(0xFFDF9527), - 600: Color(0xFFDB8D23), - 700: Color(0xFFD7821D), - 800: Color(0xFFD27817), - 900: Color(0xFFCA670E), - }, - ); + static const MaterialColor yellowOcher = + MaterialColor(0xFFDF9527, { + 50: Color(0xFFFBF2E5), + 100: Color(0xFFF5DFBE), + 200: Color(0xFFEFCA93), + 300: Color(0xFFE9B568), + 400: Color(0xFFE4A547), + 500: Color(0xFFDF9527), + 600: Color(0xFFDB8D23), + 700: Color(0xFFD7821D), + 800: Color(0xFFD27817), + 900: Color(0xFFCA670E), + }); /// MaterialAccentColor: /// 100: #FFFFE8E0 /// 200: #FFFFBCA3 /// 400: #FFFFA989 /// 700: #FFFF9E7A - static const MaterialAccentColor yellowOcherAccent = MaterialAccentColor( - 0xFFFFBCA3, - { - 100: Color(0xFFFFE8E0), - 200: Color(0xFFFFBCA3), - 400: Color(0xFFFFA989), - 700: Color(0xFFFF9E7A), - }, - ); + static const MaterialAccentColor yellowOcherAccent = + MaterialAccentColor(0xFFFFBCA3, { + 100: Color(0xFFFFE8E0), + 200: Color(0xFFFFBCA3), + 400: Color(0xFFFFA989), + 700: Color(0xFFFF9E7A), + }); } diff --git a/packages/core/test_resources/actual_data/fonts_change_output_path.gen.dart b/packages/core/test_resources/actual_data/fonts_change_output_path.gen.dart index e3899fe1..b1b61e9b 100644 --- a/packages/core/test_resources/actual_data/fonts_change_output_path.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_change_output_path.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class FontFamily { FontFamily._(); diff --git a/packages/core/test_resources/actual_data/fonts_fonts.gen.dart b/packages/core/test_resources/actual_data/fonts_fonts.gen.dart index 6b6c0903..373146e2 100644 --- a/packages/core/test_resources/actual_data/fonts_fonts.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_fonts.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class FontFamily { FontFamily._(); diff --git a/packages/core/test_resources/actual_data/fonts_fonts_change_class_name.gen.dart b/packages/core/test_resources/actual_data/fonts_fonts_change_class_name.gen.dart index 4da26f58..639d411a 100644 --- a/packages/core/test_resources/actual_data/fonts_fonts_change_class_name.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_fonts_change_class_name.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class MyFontFamily { MyFontFamily._(); diff --git a/packages/core/test_resources/actual_data/fonts_fonts_package_parameter.gen.dart b/packages/core/test_resources/actual_data/fonts_fonts_package_parameter.gen.dart index 02de3bfa..59689fde 100644 --- a/packages/core/test_resources/actual_data/fonts_fonts_package_parameter.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_fonts_package_parameter.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class FontFamily { FontFamily._(); diff --git a/packages/core/test_resources/actual_data/fonts_normal.gen.dart b/packages/core/test_resources/actual_data/fonts_normal.gen.dart index 6b6c0903..373146e2 100644 --- a/packages/core/test_resources/actual_data/fonts_normal.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_normal.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class FontFamily { FontFamily._(); diff --git a/packages/core/test_resources/actual_data/fonts_only_flutter_value.gen.dart b/packages/core/test_resources/actual_data/fonts_only_flutter_value.gen.dart index e3899fe1..b1b61e9b 100644 --- a/packages/core/test_resources/actual_data/fonts_only_flutter_value.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_only_flutter_value.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class FontFamily { FontFamily._(); diff --git a/packages/core/test_resources/actual_data/fonts_wrong_output_path.gen.dart b/packages/core/test_resources/actual_data/fonts_wrong_output_path.gen.dart index e3899fe1..b1b61e9b 100644 --- a/packages/core/test_resources/actual_data/fonts_wrong_output_path.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_wrong_output_path.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class FontFamily { FontFamily._(); diff --git a/packages/core/test_resources/pubspec_assets.yaml b/packages/core/test_resources/pubspec_assets.yaml index ae30a5fc..14f3dcb6 100644 --- a/packages/core/test_resources/pubspec_assets.yaml +++ b/packages/core/test_resources/pubspec_assets.yaml @@ -1,8 +1,11 @@ name: test +environment: + sdk: ^3.4.0 + flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) + line_length: 80 # Optional integrations: flutter_svg: true diff --git a/packages/core/test_resources/pubspec_assets_camel_case.yaml b/packages/core/test_resources/pubspec_assets_camel_case.yaml index ed0f2801..75e49a25 100644 --- a/packages/core/test_resources/pubspec_assets_camel_case.yaml +++ b/packages/core/test_resources/pubspec_assets_camel_case.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) assets: outputs: diff --git a/packages/core/test_resources/pubspec_assets_change_class_name.yaml b/packages/core/test_resources/pubspec_assets_change_class_name.yaml index 196bb6d8..e0d8bd17 100644 --- a/packages/core/test_resources/pubspec_assets_change_class_name.yaml +++ b/packages/core/test_resources/pubspec_assets_change_class_name.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) assets: outputs: diff --git a/packages/core/test_resources/pubspec_assets_exclude_files.yaml b/packages/core/test_resources/pubspec_assets_exclude_files.yaml index 01bdfc2a..b70394ed 100644 --- a/packages/core/test_resources/pubspec_assets_exclude_files.yaml +++ b/packages/core/test_resources/pubspec_assets_exclude_files.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ - line_length: 80 integrations: flutter_svg: true diff --git a/packages/core/test_resources/pubspec_assets_flavored.yaml b/packages/core/test_resources/pubspec_assets_flavored.yaml index 88a6fb10..2ad1f7da 100644 --- a/packages/core/test_resources/pubspec_assets_flavored.yaml +++ b/packages/core/test_resources/pubspec_assets_flavored.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) integrations: flutter_svg: true diff --git a/packages/core/test_resources/pubspec_assets_flavored_duplicate_entry.yaml b/packages/core/test_resources/pubspec_assets_flavored_duplicate_entry.yaml index 9465039a..f92d7abb 100644 --- a/packages/core/test_resources/pubspec_assets_flavored_duplicate_entry.yaml +++ b/packages/core/test_resources/pubspec_assets_flavored_duplicate_entry.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) integrations: flutter_svg: true diff --git a/packages/core/test_resources/pubspec_assets_lottie_integrations.yaml b/packages/core/test_resources/pubspec_assets_lottie_integrations.yaml index e5f34fca..6ff2b9cc 100644 --- a/packages/core/test_resources/pubspec_assets_lottie_integrations.yaml +++ b/packages/core/test_resources/pubspec_assets_lottie_integrations.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ - line_length: 80 integrations: lottie: true diff --git a/packages/core/test_resources/pubspec_assets_no_image_integration.yaml b/packages/core/test_resources/pubspec_assets_no_image_integration.yaml index e2efd44f..80467664 100644 --- a/packages/core/test_resources/pubspec_assets_no_image_integration.yaml +++ b/packages/core/test_resources/pubspec_assets_no_image_integration.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) integrations: image: false diff --git a/packages/core/test_resources/pubspec_assets_no_integrations.yaml b/packages/core/test_resources/pubspec_assets_no_integrations.yaml index 4054a713..8dd0c8c2 100644 --- a/packages/core/test_resources/pubspec_assets_no_integrations.yaml +++ b/packages/core/test_resources/pubspec_assets_no_integrations.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) flutter: assets: diff --git a/packages/core/test_resources/pubspec_assets_no_list.yaml b/packages/core/test_resources/pubspec_assets_no_list.yaml index 9ab2b202..9d71a941 100644 --- a/packages/core/test_resources/pubspec_assets_no_list.yaml +++ b/packages/core/test_resources/pubspec_assets_no_list.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) integrations: flutter_svg: true diff --git a/packages/core/test_resources/pubspec_assets_parse_metadata.yaml b/packages/core/test_resources/pubspec_assets_parse_metadata.yaml index 189de269..c1cf89d4 100644 --- a/packages/core/test_resources/pubspec_assets_parse_metadata.yaml +++ b/packages/core/test_resources/pubspec_assets_parse_metadata.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) parse_metadata: true # Optional (default: false) integrations: diff --git a/packages/core/test_resources/pubspec_assets_rive_integrations.yaml b/packages/core/test_resources/pubspec_assets_rive_integrations.yaml index da79a8ad..25331296 100644 --- a/packages/core/test_resources/pubspec_assets_rive_integrations.yaml +++ b/packages/core/test_resources/pubspec_assets_rive_integrations.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ - line_length: 80 integrations: rive: true diff --git a/packages/core/test_resources/pubspec_assets_snake_case.yaml b/packages/core/test_resources/pubspec_assets_snake_case.yaml index 66fb5b24..0361989c 100644 --- a/packages/core/test_resources/pubspec_assets_snake_case.yaml +++ b/packages/core/test_resources/pubspec_assets_snake_case.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) assets: outputs: diff --git a/packages/core/test_resources/pubspec_assets_svg_integrations.yaml b/packages/core/test_resources/pubspec_assets_svg_integrations.yaml index 3ab9ea3e..2b839f79 100644 --- a/packages/core/test_resources/pubspec_assets_svg_integrations.yaml +++ b/packages/core/test_resources/pubspec_assets_svg_integrations.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ - line_length: 80 integrations: flutter_svg: true diff --git a/packages/core/test_resources/pubspec_colors.yaml b/packages/core/test_resources/pubspec_colors.yaml index 4f6dd4ef..2f95ec75 100644 --- a/packages/core/test_resources/pubspec_colors.yaml +++ b/packages/core/test_resources/pubspec_colors.yaml @@ -1,8 +1,10 @@ name: test +environment: + sdk: ^3.6.0 + flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) colors: inputs: diff --git a/packages/core/test_resources/pubspec_colors_change_class_name.yaml b/packages/core/test_resources/pubspec_colors_change_class_name.yaml index 7f28947e..3f3ef53a 100644 --- a/packages/core/test_resources/pubspec_colors_change_class_name.yaml +++ b/packages/core/test_resources/pubspec_colors_change_class_name.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) colors: outputs: diff --git a/packages/core/test_resources/pubspec_colors_no_inputs.yaml b/packages/core/test_resources/pubspec_colors_no_inputs.yaml index 518b6532..042832ca 100644 --- a/packages/core/test_resources/pubspec_colors_no_inputs.yaml +++ b/packages/core/test_resources/pubspec_colors_no_inputs.yaml @@ -2,6 +2,5 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) colors: diff --git a/packages/core/test_resources/pubspec_colors_no_inputs_list.yaml b/packages/core/test_resources/pubspec_colors_no_inputs_list.yaml index 57203b5e..fcb04964 100644 --- a/packages/core/test_resources/pubspec_colors_no_inputs_list.yaml +++ b/packages/core/test_resources/pubspec_colors_no_inputs_list.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) colors: inputs: diff --git a/packages/core/test_resources/pubspec_fonts.yaml b/packages/core/test_resources/pubspec_fonts.yaml index 134b2cef..60c3d9e1 100644 --- a/packages/core/test_resources/pubspec_fonts.yaml +++ b/packages/core/test_resources/pubspec_fonts.yaml @@ -1,8 +1,10 @@ name: test +environment: + sdk: ^3.6.0 + flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) flutter: fonts: diff --git a/packages/core/test_resources/pubspec_fonts_change_class_name.yaml b/packages/core/test_resources/pubspec_fonts_change_class_name.yaml index 21bcffb6..7c2a0931 100644 --- a/packages/core/test_resources/pubspec_fonts_change_class_name.yaml +++ b/packages/core/test_resources/pubspec_fonts_change_class_name.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) fonts: outputs: diff --git a/packages/core/test_resources/pubspec_fonts_no_family.yaml b/packages/core/test_resources/pubspec_fonts_no_family.yaml index d00df0cc..e2eefbec 100644 --- a/packages/core/test_resources/pubspec_fonts_no_family.yaml +++ b/packages/core/test_resources/pubspec_fonts_no_family.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) flutter: fonts: diff --git a/packages/core/test_resources/pubspec_fonts_package_parameter.yaml b/packages/core/test_resources/pubspec_fonts_package_parameter.yaml index 8d015075..ecbec4b3 100644 --- a/packages/core/test_resources/pubspec_fonts_package_parameter.yaml +++ b/packages/core/test_resources/pubspec_fonts_package_parameter.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) fonts: outputs: diff --git a/packages/core/test_resources/pubspec_ignore_files.yaml b/packages/core/test_resources/pubspec_ignore_files.yaml index 324d85e1..edae52a1 100644 --- a/packages/core/test_resources/pubspec_ignore_files.yaml +++ b/packages/core/test_resources/pubspec_ignore_files.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) flutter: assets: diff --git a/packages/core/test_resources/pubspec_normal.yaml b/packages/core/test_resources/pubspec_normal.yaml index b1f14e68..5cecbe70 100644 --- a/packages/core/test_resources/pubspec_normal.yaml +++ b/packages/core/test_resources/pubspec_normal.yaml @@ -1,8 +1,10 @@ name: example +environment: + sdk: ^3.8.0 + flutter_gen: output: lib/gen/ - line_length: 80 integrations: flutter_svg: true diff --git a/packages/core/test_resources/pubspec_only_flutter_gen_value.yaml b/packages/core/test_resources/pubspec_only_flutter_gen_value.yaml index 03adb244..d871a47a 100644 --- a/packages/core/test_resources/pubspec_only_flutter_gen_value.yaml +++ b/packages/core/test_resources/pubspec_only_flutter_gen_value.yaml @@ -2,7 +2,6 @@ name: example flutter_gen: output: lib/gen/ - line_length: 80 colors: inputs: diff --git a/packages/core/test_resources/pubspec_unknown_mime_type.yaml b/packages/core/test_resources/pubspec_unknown_mime_type.yaml index 8b1a5f98..8f64e2ad 100644 --- a/packages/core/test_resources/pubspec_unknown_mime_type.yaml +++ b/packages/core/test_resources/pubspec_unknown_mime_type.yaml @@ -2,7 +2,6 @@ name: test flutter_gen: output: lib/gen/ # Optional (default: lib/gen/) - line_length: 80 # Optional (default: 80) flutter: assets: diff --git a/packages/core/test_resources/pubspec_wrong_output_path.yaml b/packages/core/test_resources/pubspec_wrong_output_path.yaml index 8deeb793..3054a77c 100644 --- a/packages/core/test_resources/pubspec_wrong_output_path.yaml +++ b/packages/core/test_resources/pubspec_wrong_output_path.yaml @@ -2,7 +2,6 @@ name: example flutter_gen: output: - line_length: 80 colors: inputs: From d0045b0cd07c8780c28d04774e829318822f88a0 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 09:01:05 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=F0=9F=94=A7=20Add=20examples=20build=20r?= =?UTF-8?q?un=20configurations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/runConfigurations/build_runner_build_example.xml | 8 ++++++++ .../build_runner_build_example_resources.xml | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 .idea/runConfigurations/build_runner_build_example.xml create mode 100644 .idea/runConfigurations/build_runner_build_example_resources.xml diff --git a/.idea/runConfigurations/build_runner_build_example.xml b/.idea/runConfigurations/build_runner_build_example.xml new file mode 100644 index 00000000..583b6d3d --- /dev/null +++ b/.idea/runConfigurations/build_runner_build_example.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/build_runner_build_example_resources.xml b/.idea/runConfigurations/build_runner_build_example_resources.xml new file mode 100644 index 00000000..c0bee1aa --- /dev/null +++ b/.idea/runConfigurations/build_runner_build_example_resources.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file From 7174b12b3bb130e521cf9a017e78243681a0e259 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 09:01:46 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=F0=9F=90=9B=20Respect=20the=20constraint?= =?UTF-8?q?=20in=20the=20`pubspec.yaml`=20first?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/settings/config.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/lib/settings/config.dart b/packages/core/lib/settings/config.dart index 7181a648..89b4a6d3 100644 --- a/packages/core/lib/settings/config.dart +++ b/packages/core/lib/settings/config.dart @@ -108,7 +108,7 @@ Config loadPubspecConfig(File pubspecFile, {File? buildFile}) { }; final pubspecLockMap = loadYaml(pubspecLockContent) as YamlMap?; if (safeCast(pubspecLockMap?['sdks']?['dart']) case final sdk?) { - sdkConstraint = VersionConstraint.parse(sdk); + sdkConstraint ??= VersionConstraint.parse(sdk); } final analysisOptionsFile = File( From db47401ffe6422a72d5b4da895af6a90018dda0a Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 09:06:54 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=F0=9F=9A=80=20Roll=20generated=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/example/lib/gen/assets.gen.dart | 4 +++- examples/example/lib/gen/colors.gen.dart | 3 ++- examples/example/lib/gen/fonts.gen.dart | 3 ++- examples/example_resources/lib/gen/assets.gen.dart | 4 +++- examples/example_resources/lib/gen/colors.gen.dart | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/examples/example/lib/gen/assets.gen.dart b/examples/example/lib/gen/assets.gen.dart index 1e5a1da5..47177703 100644 --- a/examples/example/lib/gen/assets.gen.dart +++ b/examples/example/lib/gen/assets.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/examples/example/lib/gen/colors.gen.dart b/examples/example/lib/gen/colors.gen.dart index 8d4254e6..59d20c8c 100644 --- a/examples/example/lib/gen/colors.gen.dart +++ b/examples/example/lib/gen/colors.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; diff --git a/examples/example/lib/gen/fonts.gen.dart b/examples/example/lib/gen/fonts.gen.dart index 1e53890c..82d6f868 100644 --- a/examples/example/lib/gen/fonts.gen.dart +++ b/examples/example/lib/gen/fonts.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import class MyFontFamily { MyFontFamily._(); diff --git a/examples/example_resources/lib/gen/assets.gen.dart b/examples/example_resources/lib/gen/assets.gen.dart index f1d31494..1d189ad3 100644 --- a/examples/example_resources/lib/gen/assets.gen.dart +++ b/examples/example_resources/lib/gen/assets.gen.dart @@ -1,3 +1,5 @@ +// dart format width=80 + /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +7,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/examples/example_resources/lib/gen/colors.gen.dart b/examples/example_resources/lib/gen/colors.gen.dart index 303a7468..f10d1368 100644 --- a/examples/example_resources/lib/gen/colors.gen.dart +++ b/examples/example_resources/lib/gen/colors.gen.dart @@ -1,3 +1,4 @@ +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** /// FlutterGen @@ -5,7 +6,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; From ea7f1805a13b3500e0bc685d2353e018537a11bf Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 09:15:34 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=F0=9F=94=8A=20Improve=20generate=20facts?= =?UTF-8?q?=20script=20logging?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/scripts/generate_facts.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/scripts/generate_facts.dart b/packages/core/scripts/generate_facts.dart index cf4fcf48..02dfc545 100644 --- a/packages/core/scripts/generate_facts.dart +++ b/packages/core/scripts/generate_facts.dart @@ -33,7 +33,9 @@ void main() async { overrideOutputPath: p.join(dir.path, 'actual_data'), ); await generator.build().catchError((e, s) { - stderr.writeln('$e\n$s'); + stderr.writeln('[FAILED] ${file.name} - ${buildFile?.name ?? 'N/A'}'); + stderr.writeln('$e'); + stderr.writeln('$s'); }); } } From 820036949a25516f1a20999a14e11a0a8af6a1a0 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Thu, 17 Jul 2025 09:15:51 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=F0=9F=9A=80=20Update=20test=20actual=20d?= =?UTF-8?q?ata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build_assets_build_assets.gen.dart | 26 ++++++++++++------- .../core/test_resources/build_assets.yaml | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart b/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart index ff4bf2d7..c7de4f8b 100644 --- a/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart +++ b/packages/core/test_resources/actual_data/build_assets_build_assets.gen.dart @@ -1,4 +1,4 @@ -// dart format width=120 +// dart format width=80 /// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** @@ -56,13 +56,16 @@ class $AssetsImagesGen { AssetGenImage get logo => const AssetGenImage('assets/images/logo.png'); /// File path: assets/images/profile.jpg - AssetGenImage get profileJpg => const AssetGenImage('assets/images/profile.jpg'); + AssetGenImage get profileJpg => + const AssetGenImage('assets/images/profile.jpg'); /// File path: assets/images/profile.png - AssetGenImage get profilePng => const AssetGenImage('assets/images/profile.png'); + AssetGenImage get profilePng => + const AssetGenImage('assets/images/profile.png'); /// List of all assets - List get values => [chip1, chip2, logo, profileJpg, profilePng]; + List get values => + [chip1, chip2, logo, profileJpg, profilePng]; } class $AssetsJsonGen { @@ -102,7 +105,8 @@ class $AssetsImagesChip3Gen { const $AssetsImagesChip3Gen(); /// File path: assets/images/chip3/chip3.jpg - AssetGenImage get chip3 => const AssetGenImage('assets/images/chip3/chip3.jpg'); + AssetGenImage get chip3 => + const AssetGenImage('assets/images/chip3/chip3.jpg'); /// List of all assets List get values => [chip3]; @@ -112,7 +116,8 @@ class $AssetsImagesChip4Gen { const $AssetsImagesChip4Gen(); /// File path: assets/images/chip4/chip4.jpg - AssetGenImage get chip4 => const AssetGenImage('assets/images/chip4/chip4.jpg'); + AssetGenImage get chip4 => + const AssetGenImage('assets/images/chip4/chip4.jpg'); /// List of all assets List get values => [chip4]; @@ -122,10 +127,12 @@ class $AssetsImagesIconsGen { const $AssetsImagesIconsGen(); /// File path: assets/images/icons/dart@test.svg - SvgGenImage get dartTest => const SvgGenImage('assets/images/icons/dart@test.svg'); + SvgGenImage get dartTest => + const SvgGenImage('assets/images/icons/dart@test.svg'); /// File path: assets/images/icons/fuchsia.svg - SvgGenImage get fuchsia => const SvgGenImage('assets/images/icons/fuchsia.svg'); + SvgGenImage get fuchsia => + const SvgGenImage('assets/images/icons/fuchsia.svg'); /// File path: assets/images/icons/kmm.svg SvgGenImage get kmm => const SvgGenImage('assets/images/icons/kmm.svg'); @@ -300,7 +307,8 @@ class SvgGenImage { placeholderBuilder: placeholderBuilder, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, - colorFilter: colorFilter ?? (color == null ? null : ColorFilter.mode(color, colorBlendMode)), + colorFilter: colorFilter ?? + (color == null ? null : ColorFilter.mode(color, colorBlendMode)), clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, ); diff --git a/packages/core/test_resources/build_assets.yaml b/packages/core/test_resources/build_assets.yaml index ccd360fd..dd414c4a 100644 --- a/packages/core/test_resources/build_assets.yaml +++ b/packages/core/test_resources/build_assets.yaml @@ -6,4 +6,4 @@ targets: flutter_gen: options: output: lib/build_gen/ - line_length: 120 + line_length: 80