-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
Fix LottieView bugs #2289
Merged
calda
merged 2 commits into
airbnb:master
from
miguel-jimenez-0529:mj-lottie-view-fixes
Jan 20, 2024
Merged
Fix LottieView bugs #2289
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| // Created by miguel_jimenez on 1/19/24. | ||
| // Copyright © 2024 Airbnb Inc. All rights reserved. | ||
|
|
||
| import Lottie | ||
| import SwiftUI | ||
|
|
||
| // MARK: - SwiftUIInteroperabilityDemoView | ||
|
|
||
| struct SwiftUIInteroperabilityDemoView: View { | ||
|
|
||
| var body: some View { | ||
| List { | ||
| Demo(name: "On appear offset animation") { | ||
| OnAppearOffsetAnimation() | ||
| } | ||
|
|
||
| Demo(name: "Placeholder size inheritance") { | ||
| PlaceholderSizeInheritance() | ||
| } | ||
| } | ||
| .navigationTitle("SwiftUI Interoperability Demo") | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Demo | ||
|
|
||
| struct Demo<Content: View>: View { | ||
|
|
||
| // MARK: Lifecycle | ||
|
|
||
| init(name: String, @ViewBuilder content: () -> Content) { | ||
| self.name = name | ||
| self.content = content() | ||
| } | ||
|
|
||
| // MARK: Internal | ||
|
|
||
| let name: String | ||
| let content: Content | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading) { | ||
| Text(name) | ||
| .frame(alignment: .top) | ||
| Spacer() | ||
| HStack(alignment: .center) { | ||
| Button(show ? "Hide" : "Show") { | ||
| show.toggle() | ||
| } | ||
| if show { | ||
| content | ||
| } | ||
| } | ||
| Spacer() | ||
| } | ||
| .frame(height: 150) | ||
| } | ||
|
|
||
| // MARK: Private | ||
|
|
||
| @State private var show = false | ||
|
|
||
| } | ||
|
|
||
| // MARK: - OnAppearOffsetAnimation | ||
|
|
||
| /// Demonstrates how `LottieView` is animated by the `.offset` modifier. | ||
| struct OnAppearOffsetAnimation: View { | ||
|
|
||
| @State private var demo1Appeared = false | ||
|
|
||
| var body: some View { | ||
| LottieView { | ||
| try await DotLottieFile.named("Samples/DotLottie/multiple_animations.lottie") | ||
| } placeholder: { | ||
| LoadingIndicator() | ||
| } | ||
| .looping() | ||
| .resizable() | ||
| .frame(width: 100, height: 100) | ||
| .offset(x: demo1Appeared ? 0 : 300) | ||
| .onAppear { | ||
| withAnimation { | ||
| demo1Appeared = true | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // MARK: - PlaceholderSizeInheritance | ||
|
|
||
| /// Demonstrates how the placeholder's `Rectangle` get's its size from it's parent. | ||
| struct PlaceholderSizeInheritance: View { | ||
|
|
||
| var body: some View { | ||
| HStack(alignment: .top) { | ||
| LottieView { | ||
| await LottieAnimation | ||
| .loadedFrom(url: URL(string: "https://a0.muscache.com/pictures/96699af6-b73e-499f-b0f5-3c862ae7d126.json")!) | ||
| } placeholder: { | ||
| Rectangle() | ||
| .fill(.red) | ||
| .cornerRadius(20) | ||
| } | ||
| .resizable() | ||
| .frame(width: 100, height: 100) | ||
|
|
||
| LottieView { | ||
| await LottieAnimation | ||
| .loadedFrom(url: URL(string: "https://a0.muscache.com/pictures/96699af6-b73e-499f-b0f5-3c862ae7d126.json")!) | ||
| } placeholder: { | ||
| Rectangle() | ||
| .fill(.red) | ||
| .cornerRadius(10) | ||
| } | ||
| .resizable() | ||
| .frame(width: 50, height: 50) | ||
|
|
||
| LottieView { | ||
| await LottieAnimation | ||
| .loadedFrom(url: URL(string: "https://a0.muscache.com/pictures/96699af6-b73e-499f-b0f5-3c862ae7d126.json")!) | ||
| } placeholder: { | ||
| Rectangle() | ||
| .fill(.red) | ||
| .cornerRadius(3) | ||
| } | ||
| .resizable() | ||
| .frame(width: 10, height: 10) | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a behavior change that will probably affect existing consumers (see comparison below) but I think this is ok because the updated behavior seems more expected and predictable