Trim shape default type value #2478
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
calda
reviewed
Sep 12, 2024
| @@ -34,7 +34,7 @@ final class Trim: ShapeItem { | |||
| end = try KeyframeGroup<LottieVector1D>(dictionary: endDictionary) | |||
| let offsetDictionary: [String: Any] = try dictionary.value(for: CodingKeys.offset) | |||
| offset = try KeyframeGroup<LottieVector1D>(dictionary: offsetDictionary) | |||
| let trimTypeRawValue: Int = try dictionary.value(for: CodingKeys.trimType) | |||
| let trimTypeRawValue: Int = try dictionary.value(for: CodingKeys.trimType) ?? TrimType.individually.rawValue | |||
There was a problem hiding this comment.
Please also make this change in the Decodable init above
|
Thanks! Could you add a sample json animation using this functionality as |
|
@calda I've updated the decoder method and added a test sample. I'm not sure why some of the tests have failed. Seems unrelated to this change. |
|
You have to record snapshots for the new sample animation, that's why the tests are failing :) |
|
I pushed a change that adds the snapshots. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I created a .lottie animation using a third party tool and I tried to render it using lottie-ios. Unfortunately, it logged an error and didn't display the file.
However, my animation was rendering just fine in the browser. After some digging, it turns out that the the trim shape dictionary decoder requires it to have a type specified. The JavaScript implementation (and probably others) doesn't require it and sets default value when not found:
https://github.com/LottieFiles/lottie-js/blob/a1bc6c5668323161a08159a2e040ff0cf14ab46c/src/shapes/trim-shape.ts#L40
In this PR, I set default trim type to
individual. Similar to the JavaScript implementation.