Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Crash when returning CGSize.zero for Media Attachment in Edit History (IOS-175)

This commit is contained in:
Marcus Kida 2023-11-10 10:50:18 +01:00
parent 79f978cee7
commit 5fbecdab2d
No known key found for this signature in database
GPG Key ID: 19FF64E08013CA40
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MastodonSDK/Sources/MastodonUI/View/Content/MediaView+Configuration.swift
View File

@ -247,17 +247,20 @@ extension MediaView {
extension MediaView {
public static func configuration(status: Mastodon.Entity.StatusEdit) -> [MediaView.Configuration] {
func aspectRatio(from attachment: Mastodon.Entity.Attachment) -> CGSize {
guard let width = attachment.meta?.width, let height = attachment.meta?.height else {
return .zero
func aspectRatio(from attachment: Mastodon.Entity.Attachment) -> CGSize? {
if let width = attachment.meta?.original?.width, let height = attachment.meta?.original?.height {
return CGSize(width: width, height: height)
} else if let width = attachment.meta?.width, let height = attachment.meta?.height {
return CGSize(width: width, height: height)
}
return CGSize(width: width, height: height)
return nil
}
func videoInfo(from attachment: Mastodon.Entity.Attachment) -> MediaView.Configuration.VideoInfo {
MediaView.Configuration.VideoInfo(
aspectRadio: aspectRatio(from: attachment),
assetURL: attachment.remoteURL,
func videoInfo(from attachment: Mastodon.Entity.Attachment) -> MediaView.Configuration.VideoInfo? {
guard let aspectRatio = aspectRatio(from: attachment) else { return nil }
return MediaView.Configuration.VideoInfo(
aspectRadio: aspectRatio,
assetURL: attachment.url,
previewURL: attachment.previewURL,
altDescription: attachment.description,
durationMS: {
@ -274,9 +277,10 @@ extension MediaView {
let configuration: MediaView.Configuration? = {
switch attachment.attachmentKind {
case .image:
guard let aspectRatio = aspectRatio(from: attachment) else { return nil }
let info = MediaView.Configuration.ImageInfo(
aspectRadio: aspectRatio(from: attachment),
assetURL: attachment.remoteURL,
aspectRadio: aspectRatio,
assetURL: attachment.url,
altDescription: attachment.description
)
return .init(
@ -286,7 +290,7 @@ extension MediaView {
total: attachments.count
)
case .video:
let info = videoInfo(from: attachment)
guard let info = videoInfo(from: attachment) else { return nil }
return .init(
info: .video(info: info),
blurhash: attachment.blurhash,
@ -294,7 +298,7 @@ extension MediaView {
total: attachments.count
)
case .gifv:
let info = videoInfo(from: attachment)
guard let info = videoInfo(from: attachment) else { return nil }
return .init(
info: .gif(info: info),
blurhash: attachment.blurhash,
@ -302,7 +306,7 @@ extension MediaView {
total: attachments.count
)
case .audio:
let info = videoInfo(from: attachment)
guard let info = videoInfo(from: attachment) else { return nil }
return .init(
info: .video(info: info),
blurhash: attachment.blurhash,