Skip to content

Commit da7bece

Browse files
authored
feat: add keyName to integrations (#330)
1 parent c4c18e5 commit da7bece

14 files changed

+53
-12
lines changed

example/lib/gen/assets.gen.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ class SvgGenImage {
304304
}
305305

306306
String get path => _assetName;
307+
308+
String get keyName => _assetName;
307309
}
308310

309311
class FlareGenImage {
@@ -345,6 +347,8 @@ class FlareGenImage {
345347
}
346348

347349
String get path => _assetName;
350+
351+
String get keyName => _assetName;
348352
}
349353

350354
class RiveGenImage {
@@ -378,6 +382,8 @@ class RiveGenImage {
378382
}
379383

380384
String get path => _assetName;
385+
386+
String get keyName => _assetName;
381387
}
382388

383389
class LottieGenImage {
@@ -435,4 +441,6 @@ class LottieGenImage {
435441
}
436442

437443
String get path => _assetName;
444+
445+
String get keyName => _assetName;
438446
}

example/lib/main.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ void main() async {
8989
// ),
9090

9191
// example_resource package.
92+
Text(MyAssets.images.icons.kmm.path),
93+
Text(MyAssets.images.icons.kmm.keyName),
94+
Text(ResAssets.images.dart.path),
95+
Text(ResAssets.images.dart.keyName),
9296
ResAssets.images.flutter3.image(),
9397
ResAssets.images.dart.svg(),
9498
SizedBox(

example_resources/lib/gen/assets.gen.dart

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/lib/generators/integrations/flare_integration.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ class FlareIntegration extends Integration {
5656
);
5757
}
5858
59-
String get path => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
59+
String get path => _assetName;
60+
61+
String get keyName => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
6062
}''';
6163

6264
@override

packages/core/lib/generators/integrations/lottie_integration.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ class LottieIntegration extends Integration {
8787
);
8888
}
8989
90-
String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
90+
String get path => _assetName;
91+
92+
String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
9193
}''';
9294

9395
@override
@@ -120,7 +122,7 @@ class LottieIntegration extends Integration {
120122
} on FormatException catch (e) {
121123
// Catches bad/corrupted json and reports it to user.
122124
stderr.writeln(e.message);
123-
} on TypeError catch(e) {
125+
} on TypeError catch (e) {
124126
// Catches bad/corrupted json and reports it to user.
125127
stderr.writeln(e);
126128
}

packages/core/lib/generators/integrations/rive_integration.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ class RiveIntegration extends Integration {
4747
);
4848
}
4949
50-
String get path => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
50+
String get path => _assetName;
51+
52+
String get keyName => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
5153
}''';
5254

5355
@override

packages/core/lib/generators/integrations/svg_integration.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ class SvgIntegration extends Integration {
6464
);
6565
}
6666
67-
String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
67+
String get path => _assetName;
68+
69+
String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
6870
}''';
6971

7072
@override

packages/core/test/colors_gen_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ void main() {
4949
expect(colorPath.mime, 'application/xml');
5050
expect(colorPath.isXml, isTrue);
5151

52-
const wrongColorPath =
53-
ColorPath('test_resources/assets/json/map.json');
52+
const wrongColorPath = ColorPath('test_resources/assets/json/map.json');
5453
expect(wrongColorPath.isXml, isFalse);
5554
});
5655

packages/core/test_resources/actual_data/assets.gen.dart

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_package_parameter.gen.dart

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)