From 98d861780636317347ce5dc066dd8bdb21f9a6ed Mon Sep 17 00:00:00 2001 From: Mao Yufeng Date: Sat, 4 Feb 2023 22:41:05 +0900 Subject: [PATCH] feat: support flutter_svg 2.0.0 (#350) * feat: support flutter_svg 2.0.0 * feat: add lint ignore * chore: update example pubspec * chore: build runner exec result * test: update test resource with svg 2.0.0 --- .../example/lib/freezed_sample.freezed.dart | 104 +++++++++--------- examples/example/lib/gen/assets.gen.dart | 20 ++-- examples/example/lib/gen/colors.gen.dart | 2 +- examples/example/lib/gen/fonts.gen.dart | 2 +- .../example/lib/json_serializable_sample.dart | 3 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- examples/example/pubspec.yaml | 18 +-- .../example_resources/lib/gen/assets.gen.dart | 20 ++-- .../example_resources/lib/gen/colors.gen.dart | 2 +- examples/example_resources/pubspec.yaml | 2 +- .../core/lib/generators/generator_helper.dart | 2 +- .../integrations/svg_integration.dart | 18 +-- .../actual_data/assets.gen.dart | 20 ++-- .../actual_data/assets_camel_case.gen.dart | 2 +- .../assets_change_class_name.gen.dart | 2 +- .../assets_flare_integrations.gen.dart | 2 +- .../actual_data/assets_ignore_files.gen.dart | 2 +- .../assets_lottie_integrations.gen.dart | 2 +- .../assets_no_integrations.gen.dart | 2 +- .../assets_package_exclude_files.gen.dart | 2 +- .../assets_package_parameter.gen.dart | 20 ++-- .../assets_rive_integrations.gen.dart | 2 +- .../actual_data/assets_snake_case.gen.dart | 2 +- .../assets_svg_integrations.gen.dart | 20 ++-- .../assets_unknown_mime_type.gen.dart | 2 +- .../actual_data/colors.gen.dart | 2 +- .../colors_change_class_name.gen.dart | 2 +- .../test_resources/actual_data/fonts.gen.dart | 2 +- .../fonts_change_class_name.gen.dart | 2 +- 29 files changed, 147 insertions(+), 136 deletions(-) diff --git a/examples/example/lib/freezed_sample.freezed.dart b/examples/example/lib/freezed_sample.freezed.dart index 13540a50..f5ccd313 100644 --- a/examples/example/lib/freezed_sample.freezed.dart +++ b/examples/example/lib/freezed_sample.freezed.dart @@ -1,7 +1,7 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND // ignore_for_file: type=lint -// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark part of 'freezed_sample.dart'; @@ -25,9 +25,9 @@ mixin _$Union { throw _privateConstructorUsedError; @optionalTypeArgs TResult? whenOrNull( - TResult Function(int value)? $default, { - TResult Function()? loading, - TResult Function(String? message)? error, + TResult? Function(int value)? $default, { + TResult? Function()? loading, + TResult? Function(String? message)? error, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -47,9 +47,9 @@ mixin _$Union { throw _privateConstructorUsedError; @optionalTypeArgs TResult? mapOrNull( - TResult Function(Data value)? $default, { - TResult Function(Loading value)? loading, - TResult Function(ErrorDetails value)? error, + TResult? Function(Data value)? $default, { + TResult? Function(Loading value)? loading, + TResult? Function(ErrorDetails value)? error, }) => throw _privateConstructorUsedError; @optionalTypeArgs @@ -65,40 +65,41 @@ mixin _$Union { /// @nodoc abstract class $UnionCopyWith<$Res> { factory $UnionCopyWith(Union value, $Res Function(Union) then) = - _$UnionCopyWithImpl<$Res>; + _$UnionCopyWithImpl<$Res, Union>; } /// @nodoc -class _$UnionCopyWithImpl<$Res> implements $UnionCopyWith<$Res> { +class _$UnionCopyWithImpl<$Res, $Val extends Union> + implements $UnionCopyWith<$Res> { _$UnionCopyWithImpl(this._value, this._then); - final Union _value; // ignore: unused_field - final $Res Function(Union) _then; + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; } /// @nodoc abstract class _$$DataCopyWith<$Res> { factory _$$DataCopyWith(_$Data value, $Res Function(_$Data) then) = __$$DataCopyWithImpl<$Res>; + @useResult $Res call({int value}); } /// @nodoc -class __$$DataCopyWithImpl<$Res> extends _$UnionCopyWithImpl<$Res> +class __$$DataCopyWithImpl<$Res> extends _$UnionCopyWithImpl<$Res, _$Data> implements _$$DataCopyWith<$Res> { __$$DataCopyWithImpl(_$Data _value, $Res Function(_$Data) _then) - : super(_value, (v) => _then(v as _$Data)); - - @override - _$Data get _value => super._value as _$Data; + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ - Object? value = freezed, + Object? value = null, }) { return _then(_$Data( - value == freezed + null == value ? _value.value : value // ignore: cast_nullable_to_non_nullable as int, @@ -124,15 +125,15 @@ class _$Data implements Data { return identical(this, other) || (other.runtimeType == runtimeType && other is _$Data && - const DeepCollectionEquality().equals(other.value, value)); + (identical(other.value, value) || other.value == value)); } @override - int get hashCode => - Object.hash(runtimeType, const DeepCollectionEquality().hash(value)); + int get hashCode => Object.hash(runtimeType, value); @JsonKey(ignore: true) @override + @pragma('vm:prefer-inline') _$$DataCopyWith<_$Data> get copyWith => __$$DataCopyWithImpl<_$Data>(this, _$identity); @@ -149,9 +150,9 @@ class _$Data implements Data { @override @optionalTypeArgs TResult? whenOrNull( - TResult Function(int value)? $default, { - TResult Function()? loading, - TResult Function(String? message)? error, + TResult? Function(int value)? $default, { + TResult? Function()? loading, + TResult? Function(String? message)? error, }) { return $default?.call(value); } @@ -183,9 +184,9 @@ class _$Data implements Data { @override @optionalTypeArgs TResult? mapOrNull( - TResult Function(Data value)? $default, { - TResult Function(Loading value)? loading, - TResult Function(ErrorDetails value)? error, + TResult? Function(Data value)? $default, { + TResult? Function(Loading value)? loading, + TResult? Function(ErrorDetails value)? error, }) { return $default?.call(this); } @@ -220,13 +221,10 @@ abstract class _$$LoadingCopyWith<$Res> { } /// @nodoc -class __$$LoadingCopyWithImpl<$Res> extends _$UnionCopyWithImpl<$Res> +class __$$LoadingCopyWithImpl<$Res> extends _$UnionCopyWithImpl<$Res, _$Loading> implements _$$LoadingCopyWith<$Res> { __$$LoadingCopyWithImpl(_$Loading _value, $Res Function(_$Loading) _then) - : super(_value, (v) => _then(v as _$Loading)); - - @override - _$Loading get _value => super._value as _$Loading; + : super(_value, _then); } /// @nodoc @@ -261,9 +259,9 @@ class _$Loading implements Loading { @override @optionalTypeArgs TResult? whenOrNull( - TResult Function(int value)? $default, { - TResult Function()? loading, - TResult Function(String? message)? error, + TResult? Function(int value)? $default, { + TResult? Function()? loading, + TResult? Function(String? message)? error, }) { return loading?.call(); } @@ -295,9 +293,9 @@ class _$Loading implements Loading { @override @optionalTypeArgs TResult? mapOrNull( - TResult Function(Data value)? $default, { - TResult Function(Loading value)? loading, - TResult Function(ErrorDetails value)? error, + TResult? Function(Data value)? $default, { + TResult? Function(Loading value)? loading, + TResult? Function(ErrorDetails value)? error, }) { return loading?.call(this); } @@ -326,25 +324,25 @@ abstract class _$$ErrorDetailsCopyWith<$Res> { factory _$$ErrorDetailsCopyWith( _$ErrorDetails value, $Res Function(_$ErrorDetails) then) = __$$ErrorDetailsCopyWithImpl<$Res>; + @useResult $Res call({String? message}); } /// @nodoc -class __$$ErrorDetailsCopyWithImpl<$Res> extends _$UnionCopyWithImpl<$Res> +class __$$ErrorDetailsCopyWithImpl<$Res> + extends _$UnionCopyWithImpl<$Res, _$ErrorDetails> implements _$$ErrorDetailsCopyWith<$Res> { __$$ErrorDetailsCopyWithImpl( _$ErrorDetails _value, $Res Function(_$ErrorDetails) _then) - : super(_value, (v) => _then(v as _$ErrorDetails)); - - @override - _$ErrorDetails get _value => super._value as _$ErrorDetails; + : super(_value, _then); + @pragma('vm:prefer-inline') @override $Res call({ Object? message = freezed, }) { return _then(_$ErrorDetails( - message == freezed + freezed == message ? _value.message : message // ignore: cast_nullable_to_non_nullable as String?, @@ -370,15 +368,15 @@ class _$ErrorDetails implements ErrorDetails { return identical(this, other) || (other.runtimeType == runtimeType && other is _$ErrorDetails && - const DeepCollectionEquality().equals(other.message, message)); + (identical(other.message, message) || other.message == message)); } @override - int get hashCode => - Object.hash(runtimeType, const DeepCollectionEquality().hash(message)); + int get hashCode => Object.hash(runtimeType, message); @JsonKey(ignore: true) @override + @pragma('vm:prefer-inline') _$$ErrorDetailsCopyWith<_$ErrorDetails> get copyWith => __$$ErrorDetailsCopyWithImpl<_$ErrorDetails>(this, _$identity); @@ -395,9 +393,9 @@ class _$ErrorDetails implements ErrorDetails { @override @optionalTypeArgs TResult? whenOrNull( - TResult Function(int value)? $default, { - TResult Function()? loading, - TResult Function(String? message)? error, + TResult? Function(int value)? $default, { + TResult? Function()? loading, + TResult? Function(String? message)? error, }) { return error?.call(message); } @@ -429,9 +427,9 @@ class _$ErrorDetails implements ErrorDetails { @override @optionalTypeArgs TResult? mapOrNull( - TResult Function(Data value)? $default, { - TResult Function(Loading value)? loading, - TResult Function(ErrorDetails value)? error, + TResult? Function(Data value)? $default, { + TResult? Function(Loading value)? loading, + TResult? Function(ErrorDetails value)? error, }) { return error?.call(this); } diff --git a/examples/example/lib/gen/assets.gen.dart b/examples/example/lib/gen/assets.gen.dart index 36ef3bff..a5c56a50 100644 --- a/examples/example/lib/gen/assets.gen.dart +++ b/examples/example/lib/gen/assets.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -273,13 +273,14 @@ class SvgGenImage { AlignmentGeometry alignment = Alignment.center, bool allowDrawingOutsideViewBox = false, WidgetBuilder? placeholderBuilder, - Color? color, - BlendMode colorBlendMode = BlendMode.srcIn, String? semanticsLabel, bool excludeFromSemantics = false, - Clip clipBehavior = Clip.hardEdge, - bool cacheColorFilter = false, - SvgTheme? theme, + SvgTheme theme = const SvgTheme(), + ColorFilter? colorFilter, + @deprecated Color? color, + @deprecated BlendMode colorBlendMode = BlendMode.srcIn, + @deprecated Clip? clipBehavior, + @deprecated bool cacheColorFilter = false, }) { return SvgPicture.asset( _assetName, @@ -293,13 +294,14 @@ class SvgGenImage { alignment: alignment, allowDrawingOutsideViewBox: allowDrawingOutsideViewBox, placeholderBuilder: placeholderBuilder, - color: color, - colorBlendMode: colorBlendMode, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, + theme: theme, + colorFilter: colorFilter, + color: color, + colorBlendMode: colorBlendMode, clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, - theme: theme, ); } diff --git a/examples/example/lib/gen/colors.gen.dart b/examples/example/lib/gen/colors.gen.dart index 88adda80..8d4254e6 100644 --- a/examples/example/lib/gen/colors.gen.dart +++ b/examples/example/lib/gen/colors.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use 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 a67e7750..1e53890c 100644 --- a/examples/example/lib/gen/fonts.gen.dart +++ b/examples/example/lib/gen/fonts.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use class MyFontFamily { MyFontFamily._(); diff --git a/examples/example/lib/json_serializable_sample.dart b/examples/example/lib/json_serializable_sample.dart index 7cf5c563..b6597042 100644 --- a/examples/example/lib/json_serializable_sample.dart +++ b/examples/example/lib/json_serializable_sample.dart @@ -4,7 +4,8 @@ part 'json_serializable_sample.g.dart'; @JsonSerializable() class Person { - final String firstName, lastName; + final String firstName; + final String lastName; final DateTime? dateOfBirth; Person({required this.firstName, required this.lastName, this.dateOfBirth}); diff --git a/examples/example/macos/Flutter/GeneratedPluginRegistrant.swift b/examples/example/macos/Flutter/GeneratedPluginRegistrant.swift index 1c04416f..5fdea8a2 100644 --- a/examples/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/examples/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,7 @@ import FlutterMacOS import Foundation -import connectivity_plus_macos +import connectivity_plus import device_info_plus_macos import flutter_local_notifications import flutter_secure_storage_macos diff --git a/examples/example/pubspec.yaml b/examples/example/pubspec.yaml index 8451fc71..8d0c08c6 100644 --- a/examples/example/pubspec.yaml +++ b/examples/example/pubspec.yaml @@ -13,13 +13,13 @@ dependencies: flutter: sdk: flutter - flutter_svg: 1.0.3 + flutter_svg: 2.0.0+1 flare_flutter: 3.0.2 rive: 0.9.1 lottie: 2.0.0 # Dependency check - collection: 1.16.0 + collection: 1.17.0 crypto: 3.0.2 glob: 2.0.2 @@ -43,15 +43,15 @@ dependencies: flutter_hooks: 0.18.3 hooks_riverpod: 1.0.3 dio: 4.0.6 - connectivity_plus: 2.3.0 + connectivity_plus: 3.0.2 ua_client_hints: 1.1.0 retrofit: 3.0.1+1 uuid: 3.0.6 http_parser: 4.0.0 protobuf: 2.0.1 - json_serializable: 6.2.0 - json_annotation: ^4.5.0 - freezed_annotation: ^2.1.0 + json_serializable: 6.6.1 + json_annotation: ^4.8.0 + freezed_annotation: ^2.2.0 intl: 0.17.0 fixnum: 1.0.0 shared_preferences: 2.0.13 @@ -92,10 +92,10 @@ dependencies: geocoding: 2.0.4 android_intent_plus: 3.1.1 share_plus: 4.0.4 - stack_trace: 1.10.0 + # stack_trace: 1.10.0 in_app_review: 2.0.4 pull_to_refresh: 2.0.0 - xml: 5.4.1 + xml: 6.2.2 example_resources: path: ../example_resources @@ -106,7 +106,7 @@ dev_dependencies: integration_test: sdk: flutter build_runner: ^2.1.11 - freezed: ^2.1.0+1 + freezed: ^2.3.2 flutter_gen_runner: ^5.1.0+1 flutter_lints: ^2.0.1 diff --git a/examples/example_resources/lib/gen/assets.gen.dart b/examples/example_resources/lib/gen/assets.gen.dart index 1e2df2ba..780ce997 100644 --- a/examples/example_resources/lib/gen/assets.gen.dart +++ b/examples/example_resources/lib/gen/assets.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -128,13 +128,14 @@ class SvgGenImage { AlignmentGeometry alignment = Alignment.center, bool allowDrawingOutsideViewBox = false, WidgetBuilder? placeholderBuilder, - Color? color, - BlendMode colorBlendMode = BlendMode.srcIn, String? semanticsLabel, bool excludeFromSemantics = false, - Clip clipBehavior = Clip.hardEdge, - bool cacheColorFilter = false, - SvgTheme? theme, + SvgTheme theme = const SvgTheme(), + ColorFilter? colorFilter, + @deprecated Color? color, + @deprecated BlendMode colorBlendMode = BlendMode.srcIn, + @deprecated Clip? clipBehavior, + @deprecated bool cacheColorFilter = false, }) { return SvgPicture.asset( _assetName, @@ -148,13 +149,14 @@ class SvgGenImage { alignment: alignment, allowDrawingOutsideViewBox: allowDrawingOutsideViewBox, placeholderBuilder: placeholderBuilder, - color: color, - colorBlendMode: colorBlendMode, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, + theme: theme, + colorFilter: colorFilter, + color: color, + colorBlendMode: colorBlendMode, clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, - theme: theme, ); } diff --git a/examples/example_resources/lib/gen/colors.gen.dart b/examples/example_resources/lib/gen/colors.gen.dart index dcc2e96b..303a7468 100644 --- a/examples/example_resources/lib/gen/colors.gen.dart +++ b/examples/example_resources/lib/gen/colors.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; diff --git a/examples/example_resources/pubspec.yaml b/examples/example_resources/pubspec.yaml index 05751c95..bea60752 100644 --- a/examples/example_resources/pubspec.yaml +++ b/examples/example_resources/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: flutter: sdk: flutter - flutter_svg: 1.0.3 + flutter_svg: 2.0.0+1 flare_flutter: 3.0.2 rive: 0.9.1 lottie: 2.0.0 diff --git a/packages/core/lib/generators/generator_helper.dart b/packages/core/lib/generators/generator_helper.dart index 1f2f8262..459dc796 100644 --- a/packages/core/lib/generators/generator_helper.dart +++ b/packages/core/lib/generators/generator_helper.dart @@ -10,7 +10,7 @@ String get header { String get ignore { return '''// coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use '''; } diff --git a/packages/core/lib/generators/integrations/svg_integration.dart b/packages/core/lib/generators/integrations/svg_integration.dart index 3af31ae8..e45d277b 100644 --- a/packages/core/lib/generators/integrations/svg_integration.dart +++ b/packages/core/lib/generators/integrations/svg_integration.dart @@ -34,13 +34,14 @@ class SvgIntegration extends Integration { AlignmentGeometry alignment = Alignment.center, bool allowDrawingOutsideViewBox = false, WidgetBuilder? placeholderBuilder, - Color? color, - BlendMode colorBlendMode = BlendMode.srcIn, String? semanticsLabel, bool excludeFromSemantics = false, - Clip clipBehavior = Clip.hardEdge, - bool cacheColorFilter = false, - SvgTheme? theme, + SvgTheme theme = const SvgTheme(), + ColorFilter? colorFilter, + @deprecated Color? color, + @deprecated BlendMode colorBlendMode = BlendMode.srcIn, + @deprecated Clip? clipBehavior, + @deprecated bool cacheColorFilter = false, }) { return SvgPicture.asset( _assetName, @@ -54,13 +55,14 @@ class SvgIntegration extends Integration { alignment: alignment, allowDrawingOutsideViewBox: allowDrawingOutsideViewBox, placeholderBuilder: placeholderBuilder, - color: color, - colorBlendMode: colorBlendMode, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, + theme: theme, + colorFilter: colorFilter, + color: color, + colorBlendMode: colorBlendMode, clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, - theme: theme, ); } diff --git a/packages/core/test_resources/actual_data/assets.gen.dart b/packages/core/test_resources/actual_data/assets.gen.dart index ee372f37..ceaf2174 100644 --- a/packages/core/test_resources/actual_data/assets.gen.dart +++ b/packages/core/test_resources/actual_data/assets.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -230,13 +230,14 @@ class SvgGenImage { AlignmentGeometry alignment = Alignment.center, bool allowDrawingOutsideViewBox = false, WidgetBuilder? placeholderBuilder, - Color? color, - BlendMode colorBlendMode = BlendMode.srcIn, String? semanticsLabel, bool excludeFromSemantics = false, - Clip clipBehavior = Clip.hardEdge, - bool cacheColorFilter = false, - SvgTheme? theme, + SvgTheme theme = const SvgTheme(), + ColorFilter? colorFilter, + @deprecated Color? color, + @deprecated BlendMode colorBlendMode = BlendMode.srcIn, + @deprecated Clip? clipBehavior, + @deprecated bool cacheColorFilter = false, }) { return SvgPicture.asset( _assetName, @@ -250,13 +251,14 @@ class SvgGenImage { alignment: alignment, allowDrawingOutsideViewBox: allowDrawingOutsideViewBox, placeholderBuilder: placeholderBuilder, - color: color, - colorBlendMode: colorBlendMode, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, + theme: theme, + colorFilter: colorFilter, + color: color, + colorBlendMode: colorBlendMode, clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, - theme: theme, ); } diff --git a/packages/core/test_resources/actual_data/assets_camel_case.gen.dart b/packages/core/test_resources/actual_data/assets_camel_case.gen.dart index 16398766..65ed2d07 100644 --- a/packages/core/test_resources/actual_data/assets_camel_case.gen.dart +++ b/packages/core/test_resources/actual_data/assets_camel_case.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; diff --git a/packages/core/test_resources/actual_data/assets_change_class_name.gen.dart b/packages/core/test_resources/actual_data/assets_change_class_name.gen.dart index 039b4665..8c46fc25 100644 --- a/packages/core/test_resources/actual_data/assets_change_class_name.gen.dart +++ b/packages/core/test_resources/actual_data/assets_change_class_name.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; 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 ad7ab9b5..bb1de62d 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 @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// 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'; 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 30c0420a..c90a80cd 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 @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; 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 cc2e36b2..60093888 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 @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; import 'package:lottie/lottie.dart'; diff --git a/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart index 76229d86..14e4fd46 100644 --- a/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; diff --git a/packages/core/test_resources/actual_data/assets_package_exclude_files.gen.dart b/packages/core/test_resources/actual_data/assets_package_exclude_files.gen.dart index af091b6d..3885f460 100644 --- a/packages/core/test_resources/actual_data/assets_package_exclude_files.gen.dart +++ b/packages/core/test_resources/actual_data/assets_package_exclude_files.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; 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 e92a83c7..a78a9104 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 @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -131,13 +131,14 @@ class SvgGenImage { AlignmentGeometry alignment = Alignment.center, bool allowDrawingOutsideViewBox = false, WidgetBuilder? placeholderBuilder, - Color? color, - BlendMode colorBlendMode = BlendMode.srcIn, String? semanticsLabel, bool excludeFromSemantics = false, - Clip clipBehavior = Clip.hardEdge, - bool cacheColorFilter = false, - SvgTheme? theme, + SvgTheme theme = const SvgTheme(), + ColorFilter? colorFilter, + @deprecated Color? color, + @deprecated BlendMode colorBlendMode = BlendMode.srcIn, + @deprecated Clip? clipBehavior, + @deprecated bool cacheColorFilter = false, }) { return SvgPicture.asset( _assetName, @@ -151,13 +152,14 @@ class SvgGenImage { alignment: alignment, allowDrawingOutsideViewBox: allowDrawingOutsideViewBox, placeholderBuilder: placeholderBuilder, - color: color, - colorBlendMode: colorBlendMode, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, + theme: theme, + colorFilter: colorFilter, + color: color, + colorBlendMode: colorBlendMode, clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, - theme: theme, ); } 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 c5b7cbec..d9e0b151 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 @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; import 'package:rive/rive.dart'; diff --git a/packages/core/test_resources/actual_data/assets_snake_case.gen.dart b/packages/core/test_resources/actual_data/assets_snake_case.gen.dart index c78b0dc6..de9d9dbb 100644 --- a/packages/core/test_resources/actual_data/assets_snake_case.gen.dart +++ b/packages/core/test_resources/actual_data/assets_snake_case.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; 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 3bde6d20..ffb24775 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 @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -119,13 +119,14 @@ class SvgGenImage { AlignmentGeometry alignment = Alignment.center, bool allowDrawingOutsideViewBox = false, WidgetBuilder? placeholderBuilder, - Color? color, - BlendMode colorBlendMode = BlendMode.srcIn, String? semanticsLabel, bool excludeFromSemantics = false, - Clip clipBehavior = Clip.hardEdge, - bool cacheColorFilter = false, - SvgTheme? theme, + SvgTheme theme = const SvgTheme(), + ColorFilter? colorFilter, + @deprecated Color? color, + @deprecated BlendMode colorBlendMode = BlendMode.srcIn, + @deprecated Clip? clipBehavior, + @deprecated bool cacheColorFilter = false, }) { return SvgPicture.asset( _assetName, @@ -139,13 +140,14 @@ class SvgGenImage { alignment: alignment, allowDrawingOutsideViewBox: allowDrawingOutsideViewBox, placeholderBuilder: placeholderBuilder, - color: color, - colorBlendMode: colorBlendMode, semanticsLabel: semanticsLabel, excludeFromSemantics: excludeFromSemantics, + theme: theme, + colorFilter: colorFilter, + color: color, + colorBlendMode: colorBlendMode, clipBehavior: clipBehavior, cacheColorFilter: cacheColorFilter, - theme: theme, ); } 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 e3f61f83..8eecfe7d 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 @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/widgets.dart'; diff --git a/packages/core/test_resources/actual_data/colors.gen.dart b/packages/core/test_resources/actual_data/colors.gen.dart index 26101023..f355a5b6 100644 --- a/packages/core/test_resources/actual_data/colors.gen.dart +++ b/packages/core/test_resources/actual_data/colors.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; diff --git a/packages/core/test_resources/actual_data/colors_change_class_name.gen.dart b/packages/core/test_resources/actual_data/colors_change_class_name.gen.dart index a6d51bae..81eeae43 100644 --- a/packages/core/test_resources/actual_data/colors_change_class_name.gen.dart +++ b/packages/core/test_resources/actual_data/colors_change_class_name.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use import 'package:flutter/painting.dart'; import 'package:flutter/material.dart'; diff --git a/packages/core/test_resources/actual_data/fonts.gen.dart b/packages/core/test_resources/actual_data/fonts.gen.dart index d708ff9a..6b6c0903 100644 --- a/packages/core/test_resources/actual_data/fonts.gen.dart +++ b/packages/core/test_resources/actual_data/fonts.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use class FontFamily { FontFamily._(); diff --git a/packages/core/test_resources/actual_data/fonts_change_class_name.gen.dart b/packages/core/test_resources/actual_data/fonts_change_class_name.gen.dart index 0e686c62..4da26f58 100644 --- a/packages/core/test_resources/actual_data/fonts_change_class_name.gen.dart +++ b/packages/core/test_resources/actual_data/fonts_change_class_name.gen.dart @@ -5,7 +5,7 @@ // coverage:ignore-file // ignore_for_file: type=lint -// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use class MyFontFamily { MyFontFamily._();