mirrors
/
SDWebImageSwiftUI
mirror of https://github.com/rela-tech/SDWebImageSwiftUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the WebImage placeholder maxWidth/maxHeight modifier, this may break some use case like `TabView`. If user want to use placeholder, limit themselves 

Also, polish the player API
This commit is contained in:
DreamPiggy 2021-03-10 18:31:42 +08:00
parent e19c35a07a
commit d17d44e3c9
2 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
SDWebImageSwiftUI/Classes/ImagePlayer.swift
View File

@ -37,6 +37,22 @@ public final class ImagePlayer : ObservableObject {
/// Current playing frame image
@Published public var currentFrame: PlatformImage?
/// Current playing frame index
@Published public var currentFrameIndex: UInt = 0
/// Current playing loop count
@Published public var currentLoopCount: UInt = 0
/// Whether current player is valid for playing. This will check the internal player exist or not
public var isValid: Bool {
player != nil
}
/// Current playing status
public var isPlaying: Bool {
player?.isPlaying ?? false
}
/// Start the animation
public func startPlaying() {
player?.startPlaying()
@ -52,38 +68,44 @@ public final class ImagePlayer : ObservableObject {
player?.stopPlaying()
}
/// Seek to frame and loop count
public func seekToFrame(at: UInt, loopCount: UInt) {
player?.seekToFrame(at: at, loopCount: loopCount)
}
/// Clear the frame buffer
public func clearFrameBuffer() {
player?.clearFrameBuffer()
}
/// Setup the player using Animated Image
/// - Parameter image: animated image
public func setupPlayer(image: PlatformImage?) {
if player != nil {
public func setupPlayer(animatedImage: SDAnimatedImageProvider) {
if isValid {
return
}
if let animatedImage = image as? SDAnimatedImageProvider & PlatformImage {
if let imagePlayer = SDAnimatedImagePlayer(provider: animatedImage) {
imagePlayer.animationFrameHandler = { [weak self] (_, frame) in
self?.currentFrame = frame
}
// Setup configuration
if let maxBufferSize = maxBufferSize {
imagePlayer.maxBufferSize = maxBufferSize
}
if let customLoopCount = customLoopCount {
imagePlayer.totalLoopCount = customLoopCount
}
imagePlayer.runLoopMode = runLoopMode
imagePlayer.playbackRate = playbackRate
imagePlayer.playbackMode = playbackMode
self.player = imagePlayer
imagePlayer.startPlaying()
if let imagePlayer = SDAnimatedImagePlayer(provider: animatedImage) {
imagePlayer.animationFrameHandler = { [weak self] (index, frame) in
self?.currentFrameIndex = index
self?.currentFrame = frame
}
imagePlayer.animationLoopHandler = { [weak self] (loopCount) in
self?.currentLoopCount = loopCount
}
// Setup configuration
if let maxBufferSize = maxBufferSize {
imagePlayer.maxBufferSize = maxBufferSize
}
if let customLoopCount = customLoopCount {
imagePlayer.totalLoopCount = customLoopCount
}
imagePlayer.runLoopMode = runLoopMode
imagePlayer.playbackRate = playbackRate
imagePlayer.playbackMode = playbackMode
self.player = imagePlayer
imagePlayer.startPlaying()
}
}
}

5
SDWebImageSwiftUI/Classes/WebImage.swift
View File

@ -80,7 +80,9 @@ public struct WebImage : View {
} else {
configure(image: imageManager.image!)
.onReceive(imageManager.$image) { image in
self.imagePlayer.setupPlayer(image: image)
if let animatedImage = image as? SDAnimatedImageProvider {
self.imagePlayer.setupPlayer(animatedImage: animatedImage)
}
}
}
} else {
@ -92,7 +94,6 @@ public struct WebImage : View {
}
} else {
setupPlaceholder()
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
.onPlatformAppear(appear: {
// Load remote image when first appear
if self.imageManager.isFirstLoad {