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

Replace UIScreen.main to get display scale on iOS 13.0 and later (#2215) #2216

Merged
merged 14 commits into from
Nov 2, 2023
Merged

Replace UIScreen.main to get display scale on iOS 13.0 and later (#2215) #2216

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e7c46c5
Use UIApplication instead of UIScreen.main on iOS 13.0 and later
hyun99999 Oct 18, 2023
634316d
Use window.windowScene.screen instead of UIScreen.main
hyun99999 Oct 18, 2023
db7be79
Update control flow
hyun99999 Oct 18, 2023
d3cbc94
Fix .zero to 1.0 ensure minimal operation through the scale factor.
hyun99999 Oct 18, 2023
ff2e189
Update Sources/Public/iOS/LottieAnimationViewBase.swift
calda Oct 18, 2023
5cf3555
Implement screenScale setter to reassign scale value
hyun99999 Oct 19, 2023
fcb4e4c
Fix to comply code format
hyun99999 Oct 19, 2023
a45f723
Add for explicit return
hyun99999 Oct 19, 2023
c7c3326
Use UIApplication instead of UIScreen.main
hyun99999 Oct 19, 2023
b5d53d6
Update APPLICATION_EXTENSION_API_ONLY value
hyun99999 Oct 19, 2023
bbc97c7
Update APPLICATION_EXTENSION_API_ONLY value
hyun99999 Oct 20, 2023
8b75d16
Use UITraitCollection to access display scale
hyun99999 Nov 1, 2023
62c5fad
Fix to comply code format
hyun99999 Nov 1, 2023
5302ad6
Ensure displayScale value that guarantees 1 or more
hyun99999 Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Sources/Public/iOS/LottieAnimationViewBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ open class LottieAnimationViewBase: UIView {

var screenScale: CGFloat {
#if os(iOS) || os(tvOS)
UIScreen.main.scale
if #available(iOS 13.0, tvOS 13.0, *) {
return max(UITraitCollection.current.displayScale, 1)
} else {
return UIScreen.main.scale
}
#else // if os(visionOS)
// We intentionally don't check `#if os(visionOS)`, because that emits
// a warning when building on Xcode 14 and earlier.
Expand Down Expand Up @@ -79,6 +83,5 @@ open class LottieAnimationViewBase: UIView {
func animationWillEnterForeground() {
// Implemented by subclasses.
}

}
#endif
Loading