Skip to content

Commit 6949852

Browse files
wasabeefwasabeef
authored
Merge pull request #51 from tuanvugoodmoney/main
Added support for Key parameter in image() and svg()
2 parents 1fca00d + 8adf7b5 commit 6949852

File tree

9 files changed

+40
-21
lines changed

9 files changed

+40
-21
lines changed

‎example/lib/gen/assets.gen.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class AssetGenImage extends AssetImage {
6969
final String _assetName;
7070

7171
Image image({
72+
Key key,
7273
ImageFrameBuilder frameBuilder,
7374
ImageLoadingBuilder loadingBuilder,
7475
ImageErrorWidgetBuilder errorBuilder,
@@ -88,6 +89,7 @@ class AssetGenImage extends AssetImage {
8889
FilterQuality filterQuality = FilterQuality.low,
8990
}) {
9091
return Image(
92+
key: key,
9193
image: this,
9294
frameBuilder: frameBuilder,
9395
loadingBuilder: loadingBuilder,
@@ -118,6 +120,7 @@ class SvgGenImage {
118120
final String _assetName;
119121

120122
SvgPicture svg({
123+
Key key,
121124
bool matchTextDirection = false,
122125
AssetBundle bundle,
123126
String package,
@@ -135,6 +138,7 @@ class SvgGenImage {
135138
}) {
136139
return SvgPicture.asset(
137140
_assetName,
141+
key: key,
138142
matchTextDirection: matchTextDirection,
139143
bundle: bundle,
140144
package: package,

‎example/lib/main.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ void main() {
2323
children: <Widget>[
2424
// Auto generated image from FlutterGen.
2525
Image(image: Assets.images.chip1),
26-
Assets.images.icons.kmm.svg(),
26+
Assets.images.icons.kmm.svg(key: Key("kmm_svg")),
2727
Assets.images.icons.fuchsia.svg(),
2828
Assets.images.icons.paint.svg(
2929
width: 120,
3030
height: 120,
3131
),
3232
Assets.pictures.chip5.image(
33+
key: Key("chip5"),
3334
width: 120,
3435
height: 120,
3536
fit: BoxFit.scaleDown,

‎example/pubspec.lock‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ packages:
2828
name: async
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "2.4.2"
31+
version: "2.5.0-nullsafety.1"
3232
boolean_selector:
3333
dependency: transitive
3434
description:
3535
name: boolean_selector
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "2.0.0"
38+
version: "2.1.0-nullsafety.1"
3939
build:
4040
dependency: transitive
4141
description:
@@ -98,14 +98,14 @@ packages:
9898
name: characters
9999
url: "https://pub.dartlang.org"
100100
source: hosted
101-
version: "1.0.0"
101+
version: "1.1.0-nullsafety.3"
102102
charcode:
103103
dependency: transitive
104104
description:
105105
name: charcode
106106
url: "https://pub.dartlang.org"
107107
source: hosted
108-
version: "1.1.3"
108+
version: "1.2.0-nullsafety.1"
109109
checked_yaml:
110110
dependency: transitive
111111
description:
@@ -126,7 +126,7 @@ packages:
126126
name: clock
127127
url: "https://pub.dartlang.org"
128128
source: hosted
129-
version: "1.0.1"
129+
version: "1.1.0-nullsafety.1"
130130
code_builder:
131131
dependency: transitive
132132
description:
@@ -140,7 +140,7 @@ packages:
140140
name: collection
141141
url: "https://pub.dartlang.org"
142142
source: hosted
143-
version: "1.14.13"
143+
version: "1.15.0-nullsafety.3"
144144
color:
145145
dependency: transitive
146146
description:
@@ -189,7 +189,7 @@ packages:
189189
name: fake_async
190190
url: "https://pub.dartlang.org"
191191
source: hosted
192-
version: "1.1.0"
192+
version: "1.2.0-nullsafety.1"
193193
fixnum:
194194
dependency: transitive
195195
description:
@@ -208,7 +208,7 @@ packages:
208208
path: ".."
209209
relative: true
210210
source: path
211-
version: "1.2.0"
211+
version: "1.2.1"
212212
flutter_svg:
213213
dependency: "direct main"
214214
description:
@@ -290,14 +290,14 @@ packages:
290290
name: matcher
291291
url: "https://pub.dartlang.org"
292292
source: hosted
293-
version: "0.12.8"
293+
version: "0.12.10-nullsafety.1"
294294
meta:
295295
dependency: transitive
296296
description:
297297
name: meta
298298
url: "https://pub.dartlang.org"
299299
source: hosted
300-
version: "1.1.8"
300+
version: "1.3.0-nullsafety.3"
301301
mime:
302302
dependency: transitive
303303
description:
@@ -332,7 +332,7 @@ packages:
332332
name: path
333333
url: "https://pub.dartlang.org"
334334
source: hosted
335-
version: "1.7.0"
335+
version: "1.8.0-nullsafety.1"
336336
path_drawing:
337337
dependency: transitive
338338
description:
@@ -414,21 +414,21 @@ packages:
414414
name: source_span
415415
url: "https://pub.dartlang.org"
416416
source: hosted
417-
version: "1.7.0"
417+
version: "1.8.0-nullsafety.2"
418418
stack_trace:
419419
dependency: transitive
420420
description:
421421
name: stack_trace
422422
url: "https://pub.dartlang.org"
423423
source: hosted
424-
version: "1.9.5"
424+
version: "1.10.0-nullsafety.1"
425425
stream_channel:
426426
dependency: transitive
427427
description:
428428
name: stream_channel
429429
url: "https://pub.dartlang.org"
430430
source: hosted
431-
version: "2.0.0"
431+
version: "2.1.0-nullsafety.1"
432432
stream_transform:
433433
dependency: transitive
434434
description:
@@ -442,21 +442,21 @@ packages:
442442
name: string_scanner
443443
url: "https://pub.dartlang.org"
444444
source: hosted
445-
version: "1.0.5"
445+
version: "1.1.0-nullsafety.1"
446446
term_glyph:
447447
dependency: transitive
448448
description:
449449
name: term_glyph
450450
url: "https://pub.dartlang.org"
451451
source: hosted
452-
version: "1.1.0"
452+
version: "1.2.0-nullsafety.1"
453453
test_api:
454454
dependency: transitive
455455
description:
456456
name: test_api
457457
url: "https://pub.dartlang.org"
458458
source: hosted
459-
version: "0.2.17"
459+
version: "0.2.19-nullsafety.2"
460460
time:
461461
dependency: transitive
462462
description:
@@ -477,14 +477,14 @@ packages:
477477
name: typed_data
478478
url: "https://pub.dartlang.org"
479479
source: hosted
480-
version: "1.2.0"
480+
version: "1.3.0-nullsafety.3"
481481
vector_math:
482482
dependency: transitive
483483
description:
484484
name: vector_math
485485
url: "https://pub.dartlang.org"
486486
source: hosted
487-
version: "2.0.8"
487+
version: "2.1.0-nullsafety.3"
488488
watcher:
489489
dependency: transitive
490490
description:
@@ -514,5 +514,5 @@ packages:
514514
source: hosted
515515
version: "2.2.1"
516516
sdks:
517-
dart: ">=2.9.0 <3.0.0"
517+
dart: ">=2.10.0-110 <2.11.0"
518518
flutter: ">=1.20.0 <2.0.0"

‎lib/src/generators/assets_generator.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ class AssetGenImage extends AssetImage {
308308
final String _assetName;
309309
310310
Image image({
311+
Key key,
311312
ImageFrameBuilder frameBuilder,
312313
ImageLoadingBuilder loadingBuilder,
313314
ImageErrorWidgetBuilder errorBuilder,
@@ -327,6 +328,7 @@ class AssetGenImage extends AssetImage {
327328
FilterQuality filterQuality = FilterQuality.low,
328329
}) {
329330
return Image(
331+
key: key,
330332
image: this,
331333
frameBuilder: frameBuilder,
332334
loadingBuilder: loadingBuilder,

‎lib/src/generators/integrations/svg_integration.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class SvgIntegration extends Integration {
1414
final String _assetName;
1515
1616
SvgPicture svg({
17+
Key key,
1718
bool matchTextDirection = false,
1819
AssetBundle bundle,
1920
String package,
@@ -31,6 +32,7 @@ class SvgIntegration extends Integration {
3132
}) {
3233
return SvgPicture.asset(
3334
_assetName,
35+
key: key,
3436
matchTextDirection: matchTextDirection,
3537
bundle: bundle,
3638
package: package,

‎test_resources/actual_data/assets.gen.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class AssetGenImage extends AssetImage {
6969
final String _assetName;
7070

7171
Image image({
72+
Key key,
7273
ImageFrameBuilder frameBuilder,
7374
ImageLoadingBuilder loadingBuilder,
7475
ImageErrorWidgetBuilder errorBuilder,
@@ -88,6 +89,7 @@ class AssetGenImage extends AssetImage {
8889
FilterQuality filterQuality = FilterQuality.low,
8990
}) {
9091
return Image(
92+
key: key,
9193
image: this,
9294
frameBuilder: frameBuilder,
9395
loadingBuilder: loadingBuilder,
@@ -118,6 +120,7 @@ class SvgGenImage {
118120
final String _assetName;
119121

120122
SvgPicture svg({
123+
Key key,
121124
bool matchTextDirection = false,
122125
AssetBundle bundle,
123126
String package,
@@ -135,6 +138,7 @@ class SvgGenImage {
135138
}) {
136139
return SvgPicture.asset(
137140
_assetName,
141+
key: key,
138142
matchTextDirection: matchTextDirection,
139143
bundle: bundle,
140144
package: package,

‎test_resources/actual_data/assets_camel_case.gen.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class AssetGenImage extends AssetImage {
3535
final String _assetName;
3636

3737
Image image({
38+
Key key,
3839
ImageFrameBuilder frameBuilder,
3940
ImageLoadingBuilder loadingBuilder,
4041
ImageErrorWidgetBuilder errorBuilder,
@@ -54,6 +55,7 @@ class AssetGenImage extends AssetImage {
5455
FilterQuality filterQuality = FilterQuality.low,
5556
}) {
5657
return Image(
58+
key: key,
5759
image: this,
5860
frameBuilder: frameBuilder,
5961
loadingBuilder: loadingBuilder,

‎test_resources/actual_data/assets_no_integrations.gen.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class AssetGenImage extends AssetImage {
6666
final String _assetName;
6767

6868
Image image({
69+
Key key,
6970
ImageFrameBuilder frameBuilder,
7071
ImageLoadingBuilder loadingBuilder,
7172
ImageErrorWidgetBuilder errorBuilder,
@@ -85,6 +86,7 @@ class AssetGenImage extends AssetImage {
8586
FilterQuality filterQuality = FilterQuality.low,
8687
}) {
8788
return Image(
89+
key: key,
8890
image: this,
8991
frameBuilder: frameBuilder,
9092
loadingBuilder: loadingBuilder,

‎test_resources/actual_data/assets_snake_case.gen.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class AssetGenImage extends AssetImage {
3535
final String _assetName;
3636

3737
Image image({
38+
Key key,
3839
ImageFrameBuilder frameBuilder,
3940
ImageLoadingBuilder loadingBuilder,
4041
ImageErrorWidgetBuilder errorBuilder,
@@ -54,6 +55,7 @@ class AssetGenImage extends AssetImage {
5455
FilterQuality filterQuality = FilterQuality.low,
5556
}) {
5657
return Image(
58+
key: key,
5759
image: this,
5860
frameBuilder: frameBuilder,
5961
loadingBuilder: loadingBuilder,

0 commit comments

Comments
 (0)