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.

Sign up for GitHub

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

Jump to bottom

add support for dotLottie #1660

Merged
merged 8 commits into from
Oct 27, 2020
Merged

add support for dotLottie #1660

merged 8 commits into from
Oct 27, 2020

Conversation

kudanai
Copy link
Contributor

@kudanai kudanai commented Oct 27, 2020

Fix parsing .lottie files
the dotLottie format (dotlottie.io) is a zip file with animation.json bundled along with image resources, and manifest

Changes

  • update zipStreamSync() to handle dotLottie use case

    • ignore manifest.json otherwise lottie will try to use it

  • update network loader to check for .lottie and treat it as a .zip

  • add support for .lottie and in rawRes

    • use magic header to determine files and use zipStreamSync() instead of fromJsonSync()
    • this has the bonus side effect of allowing .zip files in rawRes as well (which doesn't appear to have been supported before)

@LottieSnapshotBot
Copy link

Snapshot Tests
28: Report Diff

gpeal
gpeal reviewed Oct 27, 2020
View reviewed changes
Copy link
Collaborator

@gpeal gpeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Just a few minor nits

lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java Outdated Show resolved Hide resolved
lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java Outdated Show resolved Hide resolved
lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java Outdated Show resolved Hide resolved
lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java Outdated Show resolved Hide resolved
kudanai and others added 5 commits October 27, 2020 20:57
@kudanai @gpeal
Update lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactor…
5e2885b 
…y.java

Co-authored-by: Gabriel Peal <gpeal@users.noreply.github.com>
@kudanai @gpeal
Update lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactor…
e21324d 
…y.java

Co-authored-by: Gabriel Peal <gpeal@users.noreply.github.com>
@kudanai @gpeal
Update lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactor…
00fd159 
…y.java

Co-authored-by: Gabriel Peal <gpeal@users.noreply.github.com>
@kudanai @gpeal
Update lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactor…
130f46b 
…y.java

Co-authored-by: Gabriel Peal <gpeal@users.noreply.github.com>
@kudanai
[fix] oops on the logger
713b5d4
@LottieSnapshotBot
Copy link

Snapshot Tests
28: Report Diff

@gpeal gpeal merged commit d3dd2c8 into airbnb:master Oct 27, 2020
@eharrison eharrison mentioned this pull request Oct 19, 2022
Merged
@roryabraham roryabraham mentioned this pull request Feb 10, 2023
Closed
@viv3kk viv3kk mentioned this pull request Mar 10, 2023
Closed
@matinzd matinzd mentioned this pull request Jul 30, 2023
Merged
5 tasks
@kudanai kudanai deleted the lottiefiles/dotLottie branch August 9, 2023 09:25
@jhen0409 jhen0409 mentioned this pull request Oct 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpeal gpeal gpeal approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kudanai @LottieSnapshotBot @gpeal