Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add keyName to integrations #330

Merged
merged 2 commits into from Oct 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions example/lib/gen/assets.gen.dart
Expand Up @@ -304,6 +304,8 @@ class SvgGenImage {
}

String get path => _assetName;

String get keyName => _assetName;
}

class FlareGenImage {
Expand Down Expand Up @@ -345,6 +347,8 @@ class FlareGenImage {
}

String get path => _assetName;

String get keyName => _assetName;
}

class RiveGenImage {
Expand Down Expand Up @@ -378,6 +382,8 @@ class RiveGenImage {
}

String get path => _assetName;

String get keyName => _assetName;
}

class LottieGenImage {
Expand Down Expand Up @@ -435,4 +441,6 @@ class LottieGenImage {
}

String get path => _assetName;

String get keyName => _assetName;
}
4 changes: 4 additions & 0 deletions example/lib/main.dart
Expand Up @@ -89,6 +89,10 @@ void main() async {
// ),

// example_resource package.
Text(MyAssets.images.icons.kmm.path),
Text(MyAssets.images.icons.kmm.keyName),
Text(ResAssets.images.dart.path),
Text(ResAssets.images.dart.keyName),
ResAssets.images.flutter3.image(),
ResAssets.images.dart.svg(),
SizedBox(
Expand Down
16 changes: 12 additions & 4 deletions example_resources/lib/gen/assets.gen.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -56,7 +56,9 @@ class FlareIntegration extends Integration {
);
}

String get path => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
String get path => _assetName;

String get keyName => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
}''';

@override
Expand Down
Expand Up @@ -87,7 +87,9 @@ class LottieIntegration extends Integration {
);
}

String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
String get path => _assetName;

String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
}''';

@override
Expand Down Expand Up @@ -120,7 +122,7 @@ class LottieIntegration extends Integration {
} on FormatException catch (e) {
// Catches bad/corrupted json and reports it to user.
stderr.writeln(e.message);
} on TypeError catch(e) {
} on TypeError catch (e) {
// Catches bad/corrupted json and reports it to user.
stderr.writeln(e);
}
Expand Down
Expand Up @@ -47,7 +47,9 @@ class RiveIntegration extends Integration {
);
}

String get path => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
String get path => _assetName;

String get keyName => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''};
}''';

@override
Expand Down
Expand Up @@ -64,7 +64,9 @@ class SvgIntegration extends Integration {
);
}

String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
String get path => _assetName;

String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
}''';

@override
Expand Down
3 changes: 1 addition & 2 deletions packages/core/test/colors_gen_test.dart
Expand Up @@ -49,8 +49,7 @@ void main() {
expect(colorPath.mime, 'application/xml');
expect(colorPath.isXml, isTrue);

const wrongColorPath =
ColorPath('test_resources/assets/json/map.json');
const wrongColorPath = ColorPath('test_resources/assets/json/map.json');
expect(wrongColorPath.isXml, isFalse);
});

Expand Down
4 changes: 4 additions & 0 deletions packages/core/test_resources/actual_data/assets.gen.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.