From 1a87da0db967b5bb91b4ed6c1f1d9f772a4df7f1 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Mon, 5 Aug 2024 15:45:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20Add=20`Import`=20abstraction=20?= =?UTF-8?q?for=20package=20imports=20alias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/lib/generators/assets_generator.dart | 25 ++++++++--------- .../core/lib/generators/generator_helper.dart | 7 ++++- .../integrations/flare_integration.dart | 23 +++++++++------- .../integrations/image_integration.dart | 3 +-- .../generators/integrations/integration.dart | 6 ++++- .../integrations/lottie_integration.dart | 27 ++++++++++--------- .../integrations/rive_integration.dart | 15 +++++------ .../integrations/svg_integration.dart | 23 ++++++++-------- packages/core/lib/settings/import.dart | 20 ++++++++++++++ packages/core/pubspec.yaml | 1 + .../test/assets_gen_integrations_test.dart | 3 +-- 11 files changed, 92 insertions(+), 61 deletions(-) create mode 100644 packages/core/lib/settings/import.dart diff --git a/packages/core/lib/generators/assets_generator.dart b/packages/core/lib/generators/assets_generator.dart index 2547f0d48..d3de55fcf 100644 --- a/packages/core/lib/generators/assets_generator.dart +++ b/packages/core/lib/generators/assets_generator.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:collection/collection.dart'; import 'package:dart_style/dart_style.dart'; -import 'package:dartx/dartx.dart'; +import 'package:dartx/dartx.dart' hide IterableSorted; import 'package:flutter_gen_core/generators/generator_helper.dart'; import 'package:flutter_gen_core/generators/integrations/flare_integration.dart'; import 'package:flutter_gen_core/generators/integrations/image_integration.dart'; @@ -11,7 +11,6 @@ import 'package:flutter_gen_core/generators/integrations/integration.dart'; import 'package:flutter_gen_core/generators/integrations/lottie_integration.dart'; import 'package:flutter_gen_core/generators/integrations/rive_integration.dart'; import 'package:flutter_gen_core/generators/integrations/svg_integration.dart'; -import 'package:flutter_gen_core/settings/asset_type.dart'; import 'package:flutter_gen_core/settings/config.dart'; import 'package:flutter_gen_core/settings/flavored_asset.dart'; import 'package:flutter_gen_core/settings/pubspec.dart'; @@ -56,12 +55,10 @@ String generateAssets( ) { if (config.assets.isEmpty) { throw const InvalidSettingsException( - 'The value of "flutter/assets:" is incorrect.'); + 'The value of "flutter/assets:" is incorrect.', + ); } - final importsBuffer = StringBuffer(); - final classesBuffer = StringBuffer(); - final integrations = [ ImageIntegration(config.packageParameterLiteral, parseMetadata: config.flutterGen.parseMetadata), @@ -158,6 +155,7 @@ String generateAssets( └────────────────────────────────────────────────────────────────────────────────────────┘'''); } + final classesBuffer = StringBuffer(); if (config.flutterGen.assets.outputs.isDotDelimiterStyle) { classesBuffer.writeln(_dotDelimiterStyleDefinition(config, integrations)); } else if (config.flutterGen.assets.outputs.isSnakeCaseStyle) { @@ -168,19 +166,18 @@ String generateAssets( throw 'The value of "flutter_gen/assets/style." is incorrect.'; } - final imports = {}; - integrations - .where((integration) => integration.isEnabled) - .forEach((integration) { + final imports = {}; + for (final integration in integrations.where((e) => e.isEnabled)) { imports.addAll(integration.requiredImports); classesBuffer.writeln(integration.classOutput); - }); - for (final package in imports) { - importsBuffer.writeln(import(package)); } - final buffer = StringBuffer(); + final importsBuffer = StringBuffer(); + for (final e in imports.sorted((a, b) => a.import.compareTo(b.import))) { + importsBuffer.writeln(import(e)); + } + final buffer = StringBuffer(); buffer.writeln(header); buffer.writeln(ignore); buffer.writeln(importsBuffer.toString()); diff --git a/packages/core/lib/generators/generator_helper.dart b/packages/core/lib/generators/generator_helper.dart index d2eb66fa5..fab1aa04b 100644 --- a/packages/core/lib/generators/generator_helper.dart +++ b/packages/core/lib/generators/generator_helper.dart @@ -1,3 +1,5 @@ +import 'package:flutter_gen_core/settings/import.dart'; + String get header { return '''/// GENERATED CODE - DO NOT MODIFY BY HAND /// ***************************************************** @@ -15,4 +17,7 @@ String get ignore { '''; } -String import(String package) => 'import \'$package\';'; +String import(Import package) { + return 'import \'${package.import}\'' + '${package.alias != null ? ' as ${package.alias}' : ''};'; +} diff --git a/packages/core/lib/generators/integrations/flare_integration.dart b/packages/core/lib/generators/integrations/flare_integration.dart index e8644e16f..38f7f8eac 100644 --- a/packages/core/lib/generators/integrations/flare_integration.dart +++ b/packages/core/lib/generators/integrations/flare_integration.dart @@ -1,5 +1,4 @@ import 'package:flutter_gen_core/generators/integrations/integration.dart'; -import 'package:flutter_gen_core/settings/asset_type.dart'; class FlareIntegration extends Integration { FlareIntegration(String packageName) : super(packageName); @@ -7,10 +6,16 @@ class FlareIntegration extends Integration { String? get packageExpression => isPackage ? 'packages/$packageName/' : null; @override - List get requiredImports => [ - 'package:flutter/widgets.dart', - 'package:flare_flutter/flare_actor.dart', - 'package:flare_flutter/flare_controller.dart', + List get requiredImports => [ + Import('package:flutter/widgets.dart'), + Import( + 'package:flare_flutter/flare_actor.dart', + alias: '_actor', + ), + Import( + 'package:flare_flutter/flare_controller.dart', + alias: '_controller', + ), ]; @override @@ -27,22 +32,22 @@ class FlareIntegration extends Integration { ${isPackage ? "\n static const String package = '$packageName';" : ''} - FlareActor flare({ + _actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - FlareController? controller, - FlareCompletedCallback? callback, + _controller.FlareController? controller, + _actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return FlareActor( + return _actor.FlareActor( ${isPackage ? '\'$packageExpression\$_assetName\'' : '_assetName'}, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/lib/generators/integrations/image_integration.dart b/packages/core/lib/generators/integrations/image_integration.dart index 17c71b561..1090c724d 100644 --- a/packages/core/lib/generators/integrations/image_integration.dart +++ b/packages/core/lib/generators/integrations/image_integration.dart @@ -1,7 +1,6 @@ import 'dart:io'; import 'package:flutter_gen_core/generators/integrations/integration.dart'; -import 'package:flutter_gen_core/settings/asset_type.dart'; import 'package:image_size_getter/file_input.dart'; import 'package:image_size_getter/image_size_getter.dart'; @@ -21,7 +20,7 @@ class ImageIntegration extends Integration { isPackage ? "'packages/$packageName/\$_assetName'" : '_assetName'; @override - List get requiredImports => ['package:flutter/widgets.dart']; + List get requiredImports => [Import('package:flutter/widgets.dart')]; @override String get classOutput => _classDefinition; diff --git a/packages/core/lib/generators/integrations/integration.dart b/packages/core/lib/generators/integrations/integration.dart index 4a32c713a..ee1193f44 100644 --- a/packages/core/lib/generators/integrations/integration.dart +++ b/packages/core/lib/generators/integrations/integration.dart @@ -1,4 +1,8 @@ import 'package:flutter_gen_core/settings/asset_type.dart'; +import 'package:flutter_gen_core/settings/import.dart'; + +export 'package:flutter_gen_core/settings/asset_type.dart'; +export 'package:flutter_gen_core/settings/import.dart'; /// A base class for all integrations. An integration is a class that /// generates code for a specific asset type. @@ -13,7 +17,7 @@ abstract class Integration { final bool parseMetadata; - List get requiredImports; + List get requiredImports; String get classOutput; diff --git a/packages/core/lib/generators/integrations/lottie_integration.dart b/packages/core/lib/generators/integrations/lottie_integration.dart index ac9bddd6e..c10060b21 100644 --- a/packages/core/lib/generators/integrations/lottie_integration.dart +++ b/packages/core/lib/generators/integrations/lottie_integration.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter_gen_core/generators/integrations/integration.dart'; -import 'package:flutter_gen_core/settings/asset_type.dart'; import 'package:path/path.dart' as p; import 'package:pub_semver/pub_semver.dart'; @@ -23,9 +22,9 @@ class LottieIntegration extends Integration { String get packageExpression => isPackage ? ' = package' : ''; @override - List get requiredImports => [ - 'package:flutter/widgets.dart', - 'package:lottie/lottie.dart', + List get requiredImports => [ + Import('package:flutter/widgets.dart'), + Import('package:lottie/lottie.dart', alias: '_lottie'), ]; @override @@ -42,19 +41,23 @@ class LottieIntegration extends Integration { ${isPackage ? "\n static const String package = '$packageName';" : ''} - LottieBuilder lottie({ + _lottie.LottieBuilder lottie({ Animation? controller, bool? animate, - FrameRate? frameRate, + _lottie.FrameRate? frameRate, bool? repeat, bool? reverse, - LottieDelegates? delegates, - LottieOptions? options, - void Function(LottieComposition)? onLoaded, - LottieImageProviderFactory? imageProviderFactory, + _lottie.LottieDelegates? delegates, + _lottie.LottieOptions? options, + void Function(_lottie.LottieComposition)? onLoaded, + _lottie.LottieImageProviderFactory? imageProviderFactory, Key? key, AssetBundle? bundle, - Widget Function(BuildContext, Widget, LottieComposition?)? frameBuilder, + Widget Function( + BuildContext, + Widget, + _lottie.LottieComposition?, + )? frameBuilder, ImageErrorWidgetBuilder? errorBuilder, double? width, double? height, @@ -66,7 +69,7 @@ ${isPackage ? "\n static const String package = '$packageName';" : ''} FilterQuality? filterQuality, void Function(String)? onWarning, }) { - return Lottie.asset( + return _lottie.Lottie.asset( _assetName, controller: controller, animate: animate, diff --git a/packages/core/lib/generators/integrations/rive_integration.dart b/packages/core/lib/generators/integrations/rive_integration.dart index 98742c54e..12f450b90 100644 --- a/packages/core/lib/generators/integrations/rive_integration.dart +++ b/packages/core/lib/generators/integrations/rive_integration.dart @@ -1,5 +1,4 @@ import 'package:flutter_gen_core/generators/integrations/integration.dart'; -import 'package:flutter_gen_core/settings/asset_type.dart'; class RiveIntegration extends Integration { RiveIntegration(String packageName) : super(packageName); @@ -7,9 +6,9 @@ class RiveIntegration extends Integration { String? get packageExpression => isPackage ? 'packages/$packageName/' : null; @override - List get requiredImports => [ - 'package:flutter/widgets.dart', - 'package:rive/rive.dart', + List get requiredImports => [ + Import('package:flutter/widgets.dart'), + Import('package:rive/rive.dart', alias: '_rive'), ]; @override @@ -26,7 +25,7 @@ class RiveIntegration extends Integration { ${isPackage ? "\n static const String package = '$packageName';" : ''} - RiveAnimation rive({ + _rive.RiveAnimation rive({ String? artboard, List animations = const [], List stateMachines = const [], @@ -35,10 +34,10 @@ ${isPackage ? "\n static const String package = '$packageName';" : ''} Widget? placeHolder, bool antialiasing = true, bool useArtboardSize = false, - List controllers = const [], - OnInitCallback? onInit, + List<_rive.RiveAnimationController> controllers = const [], + _rive.OnInitCallback? onInit, }) { - return RiveAnimation.asset( + return _rive.RiveAnimation.asset( ${isPackage ? '\'$packageExpression\$_assetName\'' : '_assetName'}, artboard: artboard, animations: animations, diff --git a/packages/core/lib/generators/integrations/svg_integration.dart b/packages/core/lib/generators/integrations/svg_integration.dart index 1e21e1839..212f28167 100644 --- a/packages/core/lib/generators/integrations/svg_integration.dart +++ b/packages/core/lib/generators/integrations/svg_integration.dart @@ -1,7 +1,6 @@ import 'dart:io'; import 'package:flutter_gen_core/generators/integrations/integration.dart'; -import 'package:flutter_gen_core/settings/asset_type.dart'; import 'package:vector_graphics_compiler/vector_graphics_compiler.dart'; class SvgIntegration extends Integration { @@ -11,11 +10,11 @@ class SvgIntegration extends Integration { String get packageExpression => isPackage ? ' = package' : ''; @override - List get requiredImports => [ - 'package:flutter/widgets.dart', - 'package:flutter/services.dart', - 'package:flutter_svg/flutter_svg.dart', - 'package:vector_graphics/vector_graphics.dart', + List get requiredImports => [ + Import('package:flutter/widgets.dart'), + Import('package:flutter/services.dart'), + Import('package:flutter_svg/flutter_svg.dart', alias: '_svg'), + Import('package:vector_graphics/vector_graphics.dart', alias: '_vg'), ]; @override @@ -41,7 +40,7 @@ class SvgIntegration extends Integration { ${isPackage ? "\n static const String package = '$packageName';" : ''} - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -55,29 +54,29 @@ ${isPackage ? "\n static const String package = '$packageName';" : ''} WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, diff --git a/packages/core/lib/settings/import.dart b/packages/core/lib/settings/import.dart new file mode 100644 index 000000000..bf236a05f --- /dev/null +++ b/packages/core/lib/settings/import.dart @@ -0,0 +1,20 @@ +import 'package:meta/meta.dart'; + +@immutable +class Import { + const Import(this.import, {this.alias}); + + final String import; + final String? alias; + + @override + bool operator ==(Object other) { + if (identical(this, other)) return true; + return other is Import && + identical(other.import, import) && + identical(other.alias, alias); + } + + @override + int get hashCode => import.hashCode ^ alias.hashCode; +} diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index dbf129861..725b4e455 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -13,6 +13,7 @@ version_gen: path: lib/ dependencies: + meta: ^1.7.0 path: ^1.8.0 yaml: ^3.0.0 mime: ^1.0.0 diff --git a/packages/core/test/assets_gen_integrations_test.dart b/packages/core/test/assets_gen_integrations_test.dart index 66002d32b..6483c414c 100644 --- a/packages/core/test/assets_gen_integrations_test.dart +++ b/packages/core/test/assets_gen_integrations_test.dart @@ -4,7 +4,6 @@ import 'package:flutter_gen_core/generators/integrations/integration.dart'; import 'package:flutter_gen_core/generators/integrations/lottie_integration.dart'; import 'package:flutter_gen_core/generators/integrations/rive_integration.dart'; import 'package:flutter_gen_core/generators/integrations/svg_integration.dart'; -import 'package:flutter_gen_core/settings/asset_type.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; @@ -28,7 +27,7 @@ class TestIntegration extends Integration { } @override - List get requiredImports => []; + List get requiredImports => []; } void main() { From e429d2687c50e76e3490ed9710940eb04af06028 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Mon, 5 Aug 2024 15:58:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=9A=80=20Update=20generated=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/example/lib/gen/assets.gen.dart | 62 ++++++++++--------- .../example_resources/lib/gen/assets.gen.dart | 62 ++++++++++--------- .../actual_data/assets.gen.dart | 30 ++++----- .../assets_directory_path.gen.dart | 18 +++--- .../assets_flare_integrations.gen.dart | 12 ++-- .../actual_data/assets_flavored.gen.dart | 30 ++++----- .../assets_lottie_integrations.gen.dart | 22 ++++--- .../assets_package_parameter.gen.dart | 18 +++--- .../assets_parse_metadata.gen.dart | 30 ++++----- .../assets_rive_integrations.gen.dart | 10 +-- .../assets_svg_integrations.gen.dart | 18 +++--- 11 files changed, 162 insertions(+), 150 deletions(-) diff --git a/examples/example/lib/gen/assets.gen.dart b/examples/example/lib/gen/assets.gen.dart index ff963ec28..f8de5bb63 100644 --- a/examples/example/lib/gen/assets.gen.dart +++ b/examples/example/lib/gen/assets.gen.dart @@ -7,14 +7,14 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; +import 'package:flare_flutter/flare_actor.dart' as _actor; +import 'package:flare_flutter/flare_controller.dart' as _controller; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; -import 'package:flare_flutter/flare_actor.dart'; -import 'package:flare_flutter/flare_controller.dart'; -import 'package:rive/rive.dart'; -import 'package:lottie/lottie.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:lottie/lottie.dart' as _lottie; +import 'package:rive/rive.dart' as _rive; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $AssetsFlareGen { const $AssetsFlareGen(); @@ -316,7 +316,7 @@ class SvgGenImage { final Set flavors; final bool _isVecFormat; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -329,29 +329,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, @@ -384,22 +384,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - FlareActor flare({ + _actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - FlareController? controller, - FlareCompletedCallback? callback, + _controller.FlareController? controller, + _actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return FlareActor( + return _actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, @@ -431,7 +431,7 @@ class RiveGenImage { final String _assetName; final Set flavors; - RiveAnimation rive({ + _rive.RiveAnimation rive({ String? artboard, List animations = const [], List stateMachines = const [], @@ -440,10 +440,10 @@ class RiveGenImage { Widget? placeHolder, bool antialiasing = true, bool useArtboardSize = false, - List controllers = const [], - OnInitCallback? onInit, + List<_rive.RiveAnimationController> controllers = const [], + _rive.OnInitCallback? onInit, }) { - return RiveAnimation.asset( + return _rive.RiveAnimation.asset( _assetName, artboard: artboard, animations: animations, @@ -472,19 +472,23 @@ class LottieGenImage { final String _assetName; final Set flavors; - LottieBuilder lottie({ + _lottie.LottieBuilder lottie({ Animation? controller, bool? animate, - FrameRate? frameRate, + _lottie.FrameRate? frameRate, bool? repeat, bool? reverse, - LottieDelegates? delegates, - LottieOptions? options, - void Function(LottieComposition)? onLoaded, - LottieImageProviderFactory? imageProviderFactory, + _lottie.LottieDelegates? delegates, + _lottie.LottieOptions? options, + void Function(_lottie.LottieComposition)? onLoaded, + _lottie.LottieImageProviderFactory? imageProviderFactory, Key? key, AssetBundle? bundle, - Widget Function(BuildContext, Widget, LottieComposition?)? frameBuilder, + Widget Function( + BuildContext, + Widget, + _lottie.LottieComposition?, + )? frameBuilder, ImageErrorWidgetBuilder? errorBuilder, double? width, double? height, @@ -495,7 +499,7 @@ class LottieGenImage { FilterQuality? filterQuality, void Function(String)? onWarning, }) { - return Lottie.asset( + return _lottie.Lottie.asset( _assetName, controller: controller, animate: animate, diff --git a/examples/example_resources/lib/gen/assets.gen.dart b/examples/example_resources/lib/gen/assets.gen.dart index 2dec02207..f8123c83b 100644 --- a/examples/example_resources/lib/gen/assets.gen.dart +++ b/examples/example_resources/lib/gen/assets.gen.dart @@ -7,14 +7,14 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; +import 'package:flare_flutter/flare_actor.dart' as _actor; +import 'package:flare_flutter/flare_controller.dart' as _controller; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; -import 'package:flare_flutter/flare_actor.dart'; -import 'package:flare_flutter/flare_controller.dart'; -import 'package:rive/rive.dart'; -import 'package:lottie/lottie.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:lottie/lottie.dart' as _lottie; +import 'package:rive/rive.dart' as _rive; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $AssetsImagesGen { const $AssetsImagesGen(); @@ -167,7 +167,7 @@ class SvgGenImage { static const String package = 'example_resources'; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -181,29 +181,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, @@ -238,22 +238,22 @@ class FlareGenImage { static const String package = 'example_resources'; - FlareActor flare({ + _actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - FlareController? controller, - FlareCompletedCallback? callback, + _controller.FlareController? controller, + _actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return FlareActor( + return _actor.FlareActor( 'packages/example_resources/$_assetName', boundsNode: boundsNode, animation: animation, @@ -287,7 +287,7 @@ class RiveGenImage { static const String package = 'example_resources'; - RiveAnimation rive({ + _rive.RiveAnimation rive({ String? artboard, List animations = const [], List stateMachines = const [], @@ -296,10 +296,10 @@ class RiveGenImage { Widget? placeHolder, bool antialiasing = true, bool useArtboardSize = false, - List controllers = const [], - OnInitCallback? onInit, + List<_rive.RiveAnimationController> controllers = const [], + _rive.OnInitCallback? onInit, }) { - return RiveAnimation.asset( + return _rive.RiveAnimation.asset( 'packages/example_resources/$_assetName', artboard: artboard, animations: animations, @@ -330,19 +330,23 @@ class LottieGenImage { static const String package = 'example_resources'; - LottieBuilder lottie({ + _lottie.LottieBuilder lottie({ Animation? controller, bool? animate, - FrameRate? frameRate, + _lottie.FrameRate? frameRate, bool? repeat, bool? reverse, - LottieDelegates? delegates, - LottieOptions? options, - void Function(LottieComposition)? onLoaded, - LottieImageProviderFactory? imageProviderFactory, + _lottie.LottieDelegates? delegates, + _lottie.LottieOptions? options, + void Function(_lottie.LottieComposition)? onLoaded, + _lottie.LottieImageProviderFactory? imageProviderFactory, Key? key, AssetBundle? bundle, - Widget Function(BuildContext, Widget, LottieComposition?)? frameBuilder, + Widget Function( + BuildContext, + Widget, + _lottie.LottieComposition?, + )? frameBuilder, ImageErrorWidgetBuilder? errorBuilder, double? width, double? height, @@ -354,7 +358,7 @@ class LottieGenImage { FilterQuality? filterQuality, void Function(String)? onWarning, }) { - return Lottie.asset( + return _lottie.Lottie.asset( _assetName, controller: controller, animate: animate, diff --git a/packages/core/test_resources/actual_data/assets.gen.dart b/packages/core/test_resources/actual_data/assets.gen.dart index acf5974b7..14434e60b 100644 --- a/packages/core/test_resources/actual_data/assets.gen.dart +++ b/packages/core/test_resources/actual_data/assets.gen.dart @@ -7,12 +7,12 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; +import 'package:flare_flutter/flare_actor.dart' as _actor; +import 'package:flare_flutter/flare_controller.dart' as _controller; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; -import 'package:flare_flutter/flare_actor.dart'; -import 'package:flare_flutter/flare_controller.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $PicturesGen { const $PicturesGen(); @@ -258,7 +258,7 @@ class SvgGenImage { final Set flavors; final bool _isVecFormat; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -271,29 +271,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, @@ -326,22 +326,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - FlareActor flare({ + _actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - FlareController? controller, - FlareCompletedCallback? callback, + _controller.FlareController? controller, + _actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return FlareActor( + return _actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets_directory_path.gen.dart b/packages/core/test_resources/actual_data/assets_directory_path.gen.dart index e4025aad4..6d96fa94b 100644 --- a/packages/core/test_resources/actual_data/assets_directory_path.gen.dart +++ b/packages/core/test_resources/actual_data/assets_directory_path.gen.dart @@ -7,10 +7,10 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $AssetsImagesGen { const $AssetsImagesGen(); @@ -176,7 +176,7 @@ class SvgGenImage { final Set flavors; final bool _isVecFormat; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -189,29 +189,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, diff --git a/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart index 02b53db94..53e6f72bc 100644 --- a/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart @@ -7,9 +7,9 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use +import 'package:flare_flutter/flare_actor.dart' as _actor; +import 'package:flare_flutter/flare_controller.dart' as _controller; import 'package:flutter/widgets.dart'; -import 'package:flare_flutter/flare_actor.dart'; -import 'package:flare_flutter/flare_controller.dart'; class $AssetsFlareGen { const $AssetsFlareGen(); @@ -36,22 +36,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - FlareActor flare({ + _actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - FlareController? controller, - FlareCompletedCallback? callback, + _controller.FlareController? controller, + _actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return FlareActor( + return _actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets_flavored.gen.dart b/packages/core/test_resources/actual_data/assets_flavored.gen.dart index 987e64ade..6ce033fd0 100644 --- a/packages/core/test_resources/actual_data/assets_flavored.gen.dart +++ b/packages/core/test_resources/actual_data/assets_flavored.gen.dart @@ -7,12 +7,12 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; +import 'package:flare_flutter/flare_actor.dart' as _actor; +import 'package:flare_flutter/flare_controller.dart' as _controller; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; -import 'package:flare_flutter/flare_actor.dart'; -import 'package:flare_flutter/flare_controller.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $PicturesGen { const $PicturesGen(); @@ -260,7 +260,7 @@ class SvgGenImage { final Set flavors; final bool _isVecFormat; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -273,29 +273,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, @@ -328,22 +328,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - FlareActor flare({ + _actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - FlareController? controller, - FlareCompletedCallback? callback, + _controller.FlareController? controller, + _actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return FlareActor( + return _actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart index 8db51bf65..6cdabfb82 100644 --- a/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart @@ -8,7 +8,7 @@ // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; -import 'package:lottie/lottie.dart'; +import 'package:lottie/lottie.dart' as _lottie; class $AssetsLottieGen { const $AssetsLottieGen(); @@ -36,19 +36,23 @@ class LottieGenImage { final String _assetName; final Set flavors; - LottieBuilder lottie({ + _lottie.LottieBuilder lottie({ Animation? controller, bool? animate, - FrameRate? frameRate, + _lottie.FrameRate? frameRate, bool? repeat, bool? reverse, - LottieDelegates? delegates, - LottieOptions? options, - void Function(LottieComposition)? onLoaded, - LottieImageProviderFactory? imageProviderFactory, + _lottie.LottieDelegates? delegates, + _lottie.LottieOptions? options, + void Function(_lottie.LottieComposition)? onLoaded, + _lottie.LottieImageProviderFactory? imageProviderFactory, Key? key, AssetBundle? bundle, - Widget Function(BuildContext, Widget, LottieComposition?)? frameBuilder, + Widget Function( + BuildContext, + Widget, + _lottie.LottieComposition?, + )? frameBuilder, ImageErrorWidgetBuilder? errorBuilder, double? width, double? height, @@ -59,7 +63,7 @@ class LottieGenImage { FilterQuality? filterQuality, void Function(String)? onWarning, }) { - return Lottie.asset( + return _lottie.Lottie.asset( _assetName, controller: controller, animate: animate, diff --git a/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart b/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart index 21f1b1a9b..9985ca707 100644 --- a/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart +++ b/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart @@ -7,10 +7,10 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $AssetsImagesGen { const $AssetsImagesGen(); @@ -173,7 +173,7 @@ class SvgGenImage { static const String package = 'test'; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -187,29 +187,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, diff --git a/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart b/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart index ef4968182..5246589bd 100644 --- a/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart +++ b/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart @@ -7,12 +7,12 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; +import 'package:flare_flutter/flare_actor.dart' as _actor; +import 'package:flare_flutter/flare_controller.dart' as _controller; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; -import 'package:flare_flutter/flare_actor.dart'; -import 'package:flare_flutter/flare_controller.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $PicturesGen { const $PicturesGen(); @@ -267,7 +267,7 @@ class SvgGenImage { final Set flavors; final bool _isVecFormat; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -280,29 +280,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, @@ -335,22 +335,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - FlareActor flare({ + _actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - FlareController? controller, - FlareCompletedCallback? callback, + _controller.FlareController? controller, + _actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return FlareActor( + return _actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart index d296b1689..ddf214209 100644 --- a/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart @@ -8,7 +8,7 @@ // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; -import 'package:rive/rive.dart'; +import 'package:rive/rive.dart' as _rive; class $AssetsRiveGen { const $AssetsRiveGen(); @@ -35,7 +35,7 @@ class RiveGenImage { final String _assetName; final Set flavors; - RiveAnimation rive({ + _rive.RiveAnimation rive({ String? artboard, List animations = const [], List stateMachines = const [], @@ -44,10 +44,10 @@ class RiveGenImage { Widget? placeHolder, bool antialiasing = true, bool useArtboardSize = false, - List controllers = const [], - OnInitCallback? onInit, + List<_rive.RiveAnimationController> controllers = const [], + _rive.OnInitCallback? onInit, }) { - return RiveAnimation.asset( + return _rive.RiveAnimation.asset( _assetName, artboard: artboard, animations: animations, diff --git a/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart index 8eedabddb..c4bd61c9e 100644 --- a/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart @@ -7,10 +7,10 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flutter/widgets.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:vector_graphics/vector_graphics.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart' as _svg; +import 'package:vector_graphics/vector_graphics.dart' as _vg; class $AssetsImagesGen { const $AssetsImagesGen(); @@ -58,7 +58,7 @@ class SvgGenImage { final Set flavors; final bool _isVecFormat; - SvgPicture svg({ + _svg.SvgPicture svg({ Key? key, bool matchTextDirection = false, AssetBundle? bundle, @@ -71,29 +71,29 @@ class SvgGenImage { WidgetBuilder? placeholderBuilder, String? semanticsLabel, bool excludeFromSemantics = false, - SvgTheme? theme, + _svg.SvgTheme? theme, ColorFilter? colorFilter, Clip clipBehavior = Clip.hardEdge, @deprecated Color? color, @deprecated BlendMode colorBlendMode = BlendMode.srcIn, @deprecated bool cacheColorFilter = false, }) { - final BytesLoader loader; + final _svg.BytesLoader loader; if (_isVecFormat) { - loader = AssetBytesLoader( + loader = _vg.AssetBytesLoader( _assetName, assetBundle: bundle, packageName: package, ); } else { - loader = SvgAssetLoader( + loader = _svg.SvgAssetLoader( _assetName, assetBundle: bundle, packageName: package, theme: theme, ); } - return SvgPicture( + return _svg.SvgPicture( loader, key: key, matchTextDirection: matchTextDirection, From 6ac0c46e6aa6518941e6ed95641b2c1498d25ba5 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Fri, 9 Aug 2024 15:20:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Improve=20flare=20alia?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/example/lib/gen/assets.gen.dart | 12 ++++++------ examples/example_resources/lib/gen/assets.gen.dart | 12 ++++++------ .../generators/integrations/flare_integration.dart | 12 ++++++------ .../core/test_resources/actual_data/assets.gen.dart | 12 ++++++------ .../actual_data/assets_flare_integrations.gen.dart | 12 ++++++------ .../actual_data/assets_flavored.gen.dart | 12 ++++++------ .../actual_data/assets_parse_metadata.gen.dart | 12 ++++++------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/examples/example/lib/gen/assets.gen.dart b/examples/example/lib/gen/assets.gen.dart index f8de5bb63..7d719b684 100644 --- a/examples/example/lib/gen/assets.gen.dart +++ b/examples/example/lib/gen/assets.gen.dart @@ -7,8 +7,8 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flare_flutter/flare_actor.dart' as _actor; -import 'package:flare_flutter/flare_controller.dart' as _controller; +import 'package:flare_flutter/flare_actor.dart' as _flare_actor; +import 'package:flare_flutter/flare_controller.dart' as _flare_controller; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart' as _svg; @@ -384,22 +384,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - _actor.FlareActor flare({ + _flare_actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - _controller.FlareController? controller, - _actor.FlareCompletedCallback? callback, + _flare_controller.FlareController? controller, + _flare_actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return _actor.FlareActor( + return _flare_actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/examples/example_resources/lib/gen/assets.gen.dart b/examples/example_resources/lib/gen/assets.gen.dart index f8123c83b..496ea6579 100644 --- a/examples/example_resources/lib/gen/assets.gen.dart +++ b/examples/example_resources/lib/gen/assets.gen.dart @@ -7,8 +7,8 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flare_flutter/flare_actor.dart' as _actor; -import 'package:flare_flutter/flare_controller.dart' as _controller; +import 'package:flare_flutter/flare_actor.dart' as _flare_actor; +import 'package:flare_flutter/flare_controller.dart' as _flare_controller; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart' as _svg; @@ -238,22 +238,22 @@ class FlareGenImage { static const String package = 'example_resources'; - _actor.FlareActor flare({ + _flare_actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - _controller.FlareController? controller, - _actor.FlareCompletedCallback? callback, + _flare_controller.FlareController? controller, + _flare_actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return _actor.FlareActor( + return _flare_actor.FlareActor( 'packages/example_resources/$_assetName', boundsNode: boundsNode, animation: animation, diff --git a/packages/core/lib/generators/integrations/flare_integration.dart b/packages/core/lib/generators/integrations/flare_integration.dart index 38f7f8eac..949cc91f8 100644 --- a/packages/core/lib/generators/integrations/flare_integration.dart +++ b/packages/core/lib/generators/integrations/flare_integration.dart @@ -10,11 +10,11 @@ class FlareIntegration extends Integration { Import('package:flutter/widgets.dart'), Import( 'package:flare_flutter/flare_actor.dart', - alias: '_actor', + alias: '_flare_actor', ), Import( 'package:flare_flutter/flare_controller.dart', - alias: '_controller', + alias: '_flare_controller', ), ]; @@ -32,22 +32,22 @@ class FlareIntegration extends Integration { ${isPackage ? "\n static const String package = '$packageName';" : ''} - _actor.FlareActor flare({ + _flare_actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - _controller.FlareController? controller, - _actor.FlareCompletedCallback? callback, + _flare_controller.FlareController? controller, + _flare_actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return _actor.FlareActor( + return _flare_actor.FlareActor( ${isPackage ? '\'$packageExpression\$_assetName\'' : '_assetName'}, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets.gen.dart b/packages/core/test_resources/actual_data/assets.gen.dart index 14434e60b..6d465daf4 100644 --- a/packages/core/test_resources/actual_data/assets.gen.dart +++ b/packages/core/test_resources/actual_data/assets.gen.dart @@ -7,8 +7,8 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flare_flutter/flare_actor.dart' as _actor; -import 'package:flare_flutter/flare_controller.dart' as _controller; +import 'package:flare_flutter/flare_actor.dart' as _flare_actor; +import 'package:flare_flutter/flare_controller.dart' as _flare_controller; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart' as _svg; @@ -326,22 +326,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - _actor.FlareActor flare({ + _flare_actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - _controller.FlareController? controller, - _actor.FlareCompletedCallback? callback, + _flare_controller.FlareController? controller, + _flare_actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return _actor.FlareActor( + return _flare_actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart index 53e6f72bc..68b8b3b9c 100644 --- a/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart @@ -7,8 +7,8 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flare_flutter/flare_actor.dart' as _actor; -import 'package:flare_flutter/flare_controller.dart' as _controller; +import 'package:flare_flutter/flare_actor.dart' as _flare_actor; +import 'package:flare_flutter/flare_controller.dart' as _flare_controller; import 'package:flutter/widgets.dart'; class $AssetsFlareGen { @@ -36,22 +36,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - _actor.FlareActor flare({ + _flare_actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - _controller.FlareController? controller, - _actor.FlareCompletedCallback? callback, + _flare_controller.FlareController? controller, + _flare_actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return _actor.FlareActor( + return _flare_actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets_flavored.gen.dart b/packages/core/test_resources/actual_data/assets_flavored.gen.dart index 6ce033fd0..92612dfdd 100644 --- a/packages/core/test_resources/actual_data/assets_flavored.gen.dart +++ b/packages/core/test_resources/actual_data/assets_flavored.gen.dart @@ -7,8 +7,8 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flare_flutter/flare_actor.dart' as _actor; -import 'package:flare_flutter/flare_controller.dart' as _controller; +import 'package:flare_flutter/flare_actor.dart' as _flare_actor; +import 'package:flare_flutter/flare_controller.dart' as _flare_controller; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart' as _svg; @@ -328,22 +328,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - _actor.FlareActor flare({ + _flare_actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - _controller.FlareController? controller, - _actor.FlareCompletedCallback? callback, + _flare_controller.FlareController? controller, + _flare_actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return _actor.FlareActor( + return _flare_actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation, diff --git a/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart b/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart index 5246589bd..3f7a3e6e5 100644 --- a/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart +++ b/packages/core/test_resources/actual_data/assets_parse_metadata.gen.dart @@ -7,8 +7,8 @@ // ignore_for_file: type=lint // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use -import 'package:flare_flutter/flare_actor.dart' as _actor; -import 'package:flare_flutter/flare_controller.dart' as _controller; +import 'package:flare_flutter/flare_actor.dart' as _flare_actor; +import 'package:flare_flutter/flare_controller.dart' as _flare_controller; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart' as _svg; @@ -335,22 +335,22 @@ class FlareGenImage { final String _assetName; final Set flavors; - _actor.FlareActor flare({ + _flare_actor.FlareActor flare({ String? boundsNode, String? animation, BoxFit fit = BoxFit.contain, Alignment alignment = Alignment.center, bool isPaused = false, bool snapToEnd = false, - _controller.FlareController? controller, - _actor.FlareCompletedCallback? callback, + _flare_controller.FlareController? controller, + _flare_actor.FlareCompletedCallback? callback, Color? color, bool shouldClip = true, bool sizeFromArtboard = false, String? artboard, bool antialias = true, }) { - return _actor.FlareActor( + return _flare_actor.FlareActor( _assetName, boundsNode: boundsNode, animation: animation,