swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable local echoes for media uploads on development builds. (#3514)

Browse Source 
* Enable local echoes for media uploads on development builds.
* Use media sizes when loading timeline items so they can take advantage of the cached local echo data.
This commit is contained in:
Stefan Ceriu 2024-11-14 18:33:37 +02:00 committed by GitHub
parent 5aadf4e65b
commit 7e192b7571
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 149 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ElementX/Sources/Screens/MediaUploadPreviewScreen/MediaUploadPreviewScreenViewModel.swift
View File

@ -45,9 +45,9 @@ class MediaUploadPreviewScreenViewModel: MediaUploadPreviewScreenViewModelType,
switch viewAction {
case .send:
Task {
let progressSubject = CurrentValueSubject<Double, Never>(0.0)
let progressSubject = AppSettings.isDevelopmentBuild ? nil : CurrentValueSubject<Double, Never>(0.0)
startLoading(progressPublisher: progressSubject.asCurrentValuePublisher())
startLoading(progressPublisher: progressSubject?.asCurrentValuePublisher())
switch await mediaUploadingPreprocessor.processMedia(at: url) {
case .success(let mediaInfo):
@ -75,7 +75,7 @@ class MediaUploadPreviewScreenViewModel: MediaUploadPreviewScreenViewModelType,
// MARK: - Private
private func sendAttachment(mediaInfo: MediaInfo, progressSubject: CurrentValueSubject<Double, Never>) async -> Result<Void, TimelineProxyError> {
private func sendAttachment(mediaInfo: MediaInfo, progressSubject: CurrentValueSubject<Double, Never>?) async -> Result<Void, TimelineProxyError> {
let requestHandle: ((SendAttachmentJoinHandleProtocol) -> Void) = { [weak self] handle in
self?.requestHandle = handle
}
@ -94,10 +94,16 @@ class MediaUploadPreviewScreenViewModel: MediaUploadPreviewScreenViewModelType,
private static let loadingIndicatorIdentifier = "\(MediaUploadPreviewScreenViewModel.self)-Loading"
private func startLoading(progressPublisher: CurrentValuePublisher<Double, Never>) {
private func startLoading(progressPublisher: CurrentValuePublisher<Double, Never>?) {
let progress: UserIndicator.Progress = if let progressPublisher {
.published(progressPublisher)
} else {
.indeterminate
}
userIndicatorController.submitIndicator(
UserIndicator(id: Self.loadingIndicatorIdentifier,
type: .modal(progress: .published(progressPublisher), interactiveDismissDisabled: false, allowsInteraction: true),
type: .modal(progress: progress, interactiveDismissDisabled: false, allowsInteraction: true),
title: L10n.commonSending,
persistent: true)
)

57
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/ImageRoomTimelineView.swift
View File

@ -17,19 +17,12 @@ struct ImageRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
VStack(alignment: .leading, spacing: 4) {
LoadableImage(mediaSource: source,
mediaType: .timelineItem,
blurhash: timelineItem.content.blurhash,
mediaProvider: context.mediaProvider) {
placeholder
}
.timelineMediaFrame(height: timelineItem.content.height,
aspectRatio: timelineItem.content.aspectRatio)
.accessibilityElement(children: .ignore)
.accessibilityLabel(L10n.commonImage)
// This clip shape is distinct from the one in the styler as that one
// operates on the entire message so wouldn't round the bottom corners.
.clipShape(RoundedRectangle(cornerRadius: hasMediaCaption ? 6 : 0))
loadableImage
.accessibilityElement(children: .ignore)
.accessibilityLabel(L10n.commonImage)
// This clip shape is distinct from the one in the styler as that one
// operates on the entire message so wouldn't round the bottom corners.
.clipShape(RoundedRectangle(cornerRadius: hasMediaCaption ? 6 : 0))
if let attributedCaption = timelineItem.content.formattedCaption {
FormattedBodyText(attributedString: attributedCaption,
@ -44,15 +37,32 @@ struct ImageRoomTimelineView: View {
}
}
var source: MediaSourceProxy {
guard timelineItem.content.contentType != .gif, let thumbnailSource = timelineItem.content.thumbnailSource else {
return timelineItem.content.source
@ViewBuilder
private var loadableImage: some View {
if timelineItem.content.contentType == .gif {
LoadableImage(mediaSource: timelineItem.content.source,
mediaType: .timelineItem,
blurhash: timelineItem.content.blurhash,
size: timelineItem.content.size,
mediaProvider: context.mediaProvider) {
placeholder
}
.timelineMediaFrame(height: timelineItem.content.thumbnailSize?.height,
aspectRatio: timelineItem.content.aspectRatio)
} else {
LoadableImage(mediaSource: timelineItem.content.thumbnailSource ?? timelineItem.content.source,
mediaType: .timelineItem,
blurhash: timelineItem.content.blurhash,
size: timelineItem.content.thumbnailSize ?? timelineItem.content.size,
mediaProvider: context.mediaProvider) {
placeholder
}
.timelineMediaFrame(height: timelineItem.content.thumbnailSize?.height ?? timelineItem.content.size?.height,
aspectRatio: timelineItem.content.thumbnailAspectRatio ?? timelineItem.content.aspectRatio)
}
return thumbnailSource
}
var placeholder: some View {
private var placeholder: some View {
Rectangle()
.foregroundColor(timelineItem.isOutgoing ? .compound._bgBubbleOutgoing : .compound._bgBubbleIncoming)
.opacity(0.3)
@ -100,8 +110,8 @@ struct ImageRoomTimelineView_Previews: PreviewProvider, TestablePreview {
sender: .init(id: "Bob"),
content: .init(filename: "Blurhashed.jpg",
source: MediaSourceProxy(url: .picturesDirectory, mimeType: "image/gif"),
thumbnailSource: nil,
aspectRatio: 0.7,
thumbnailSource: nil,
blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW",
contentType: .gif)))
@ -115,10 +125,9 @@ struct ImageRoomTimelineView_Previews: PreviewProvider, TestablePreview {
content: .init(filename: "Blurhashed.jpg",
caption: "This is a great image 😎",
source: MediaSourceProxy(url: .picturesDirectory, mimeType: "image/png"),
thumbnailSource: nil,
width: 50,
height: 50,
size: .init(width: 50, height: 50),
aspectRatio: 1,
thumbnailSource: nil,
blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW",
contentType: .gif)))
}

3
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/StickerRoomTimelineView.swift
View File

@ -17,10 +17,11 @@ struct StickerRoomTimelineView: View {
LoadableImage(url: timelineItem.imageURL,
mediaType: .timelineItem,
blurhash: timelineItem.blurhash,
size: timelineItem.size,
mediaProvider: context.mediaProvider) {
placeholder
}
.timelineMediaFrame(height: timelineItem.height,
.timelineMediaFrame(height: timelineItem.size?.height,
aspectRatio: timelineItem.aspectRatio)
.accessibilityElement(children: .ignore)
.accessibilityLabel("\(L10n.commonSticker), \(timelineItem.body)")

5
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/VideoRoomTimelineView.swift
View File

@ -18,7 +18,7 @@ struct VideoRoomTimelineView: View {
TimelineStyler(timelineItem: timelineItem) {
VStack(alignment: .leading, spacing: 4) {
thumbnail
.timelineMediaFrame(height: timelineItem.content.height,
.timelineMediaFrame(height: timelineItem.content.thumbnailSize?.height,
aspectRatio: timelineItem.content.aspectRatio)
.accessibilityElement(children: .ignore)
.accessibilityLabel(L10n.commonVideo)
@ -45,6 +45,7 @@ struct VideoRoomTimelineView: View {
LoadableImage(mediaSource: thumbnailSource,
mediaType: .timelineItem,
blurhash: timelineItem.content.blurhash,
size: timelineItem.content.thumbnailSize,
mediaProvider: context.mediaProvider) { imageView in
imageView
.overlay { playIcon }
@ -114,8 +115,8 @@ struct VideoRoomTimelineView_Previews: PreviewProvider, TestablePreview {
content: .init(filename: "Blurhashed.mp4",
duration: 23,
source: nil,
thumbnailSource: nil,
aspectRatio: 0.7,
thumbnailSource: nil,
blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW")))
VideoRoomTimelineView(timelineItem: VideoRoomTimelineItem(id: .randomEvent,

10
ElementX/Sources/Services/Timeline/Fixtures/RoomTimelineItemFixtures.swift
View File

@ -260,10 +260,9 @@ enum RoomTimelineItemFixtures {
content: .init(filename: "video.mp4",
duration: 100,
source: .init(url: .picturesDirectory, mimeType: nil),
thumbnailSource: .init(url: .picturesDirectory, mimeType: nil),
width: 1920,
height: 1080,
size: .init(width: 1920, height: 1080),
aspectRatio: 1.78,
thumbnailSource: .init(url: .picturesDirectory, mimeType: nil),
blurhash: "KtI~70X5V?yss9oyrYs:t6")),
ImageRoomTimelineItem(id: .randomEvent,
timestamp: "10:47 am",
@ -274,10 +273,9 @@ enum RoomTimelineItemFixtures {
sender: .init(id: ""),
content: .init(filename: "image.jpg",
source: .init(url: .picturesDirectory, mimeType: nil),
thumbnailSource: nil,
width: 5120,
height: 3412,
size: .init(width: 5120, height: 3412),
aspectRatio: 1.5,
thumbnailSource: nil,
blurhash: "KpE4oyayR5|GbHb];3j@of"))
]
}

9
ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/ImageRoomTimelineItemContent.swift
View File

@ -15,10 +15,13 @@ struct ImageRoomTimelineItemContent: Hashable {
/// The original textual representation of the formatted caption directly from the event (usually HTML code)
var formattedCaptionHTMLString: String?
let source: MediaSourceProxy
let thumbnailSource: MediaSourceProxy?
var width: CGFloat?
var height: CGFloat?
var size: CGSize?
var aspectRatio: CGFloat?
let thumbnailSource: MediaSourceProxy?
var thumbnailSize: CGSize?
var thumbnailAspectRatio: CGFloat?
var blurhash: String?
var contentType: UTType?
}

10
ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VideoRoomTimelineItemContent.swift
View File

@ -15,11 +15,15 @@ struct VideoRoomTimelineItemContent: Hashable {
/// The original textual representation of the formatted caption directly from the event (usually HTML code)
var formattedCaptionHTMLString: String?
let duration: TimeInterval
let source: MediaSourceProxy?
let thumbnailSource: MediaSourceProxy?
var width: CGFloat?
var height: CGFloat?
var size: CGSize?
var aspectRatio: CGFloat?
let thumbnailSource: MediaSourceProxy?
var thumbnailSize: CGSize?
var thumbnailAspectRatio: CGFloat?
var blurhash: String?
var contentType: UTType?
}

3
ElementX/Sources/Services/Timeline/TimelineItems/Items/Other/StickerRoomTimelineItem.swift
View File

@ -19,8 +19,7 @@ struct StickerRoomTimelineItem: EventBasedTimelineItemProtocol, Equatable {
let imageURL: URL
var width: CGFloat?
var height: CGFloat?
var size: CGSize?
var aspectRatio: CGFloat?
var blurhash: String?

94
ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
View File

@ -121,11 +121,16 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
_ imageInfo: ImageInfo,
_ imageURL: URL,
_ isOutgoing: Bool) -> RoomTimelineItemProtocol {
var aspectRatio: CGFloat?
let width = imageInfo.width.map(CGFloat.init)
let height = imageInfo.height.map(CGFloat.init)
if let width, let height, width > 0, height > 0 {
aspectRatio = width / height
var imageSize: CGSize?
var imageAspectRatio: CGFloat?
if let height = imageInfo.height,
let width = imageInfo.width {
imageSize = .init(width: CGFloat(width), height: CGFloat(height))
if width > 0, height > 0 {
imageAspectRatio = CGFloat(width) / CGFloat(height)
}
}
return StickerRoomTimelineItem(id: eventItemProxy.id,
@ -136,9 +141,8 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
canBeRepliedTo: eventItemProxy.canBeRepliedTo,
sender: eventItemProxy.sender,
imageURL: imageURL,
width: width,
height: height,
aspectRatio: aspectRatio,
size: imageSize,
aspectRatio: imageAspectRatio,
blurhash: imageInfo.blurhash,
properties: RoomTimelineItemProperties(reactions: aggregateReactions(eventItemProxy.reactions),
deliveryStatus: eventItemProxy.deliveryStatus,
@ -513,18 +517,37 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
source: MediaSourceProxy(source: messageContent.source, mimeType: messageContent.info?.mimetype),
contentType: UTType(mimeType: messageContent.info?.mimetype, fallbackFilename: messageContent.filename))
}
private func buildImageTimelineItemContent(_ messageContent: ImageMessageContent) -> ImageRoomTimelineItemContent {
let htmlCaption = messageContent.formattedCaption?.format == .html ? messageContent.formattedCaption?.body : nil
let formattedCaption = htmlCaption != nil ? attributedStringBuilder.fromHTML(htmlCaption) : attributedStringBuilder.fromPlain(messageContent.caption)
let thumbnailSource = messageContent.info?.thumbnailSource.map { MediaSourceProxy(source: $0, mimeType: messageContent.info?.thumbnailInfo?.mimetype) }
let width = messageContent.info?.width.map(CGFloat.init)
let height = messageContent.info?.height.map(CGFloat.init)
var aspectRatio: CGFloat?
if let width, let height, width > 0, height > 0 {
aspectRatio = width / height
var thumbnailSize: CGSize?
var thumbnailAspectRatio: CGFloat?
if let thumbnailInfo = messageContent.info?.thumbnailInfo,
let height = thumbnailInfo.height,
let width = thumbnailInfo.width {
thumbnailSize = .init(width: CGFloat(width), height: CGFloat(height))
if width > 0, height > 0 {
thumbnailAspectRatio = CGFloat(width) / CGFloat(height)
}
}
var imageSize: CGSize?
var imageAspectRatio: CGFloat?
if let imageInfo = messageContent.info,
let height = imageInfo.height,
let width = imageInfo.width {
imageSize = .init(width: CGFloat(width), height: CGFloat(height))
if width > 0, height > 0 {
imageAspectRatio = CGFloat(width) / CGFloat(height)
}
}
return .init(filename: messageContent.filename,
@ -532,10 +555,11 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
formattedCaption: formattedCaption,
formattedCaptionHTMLString: htmlCaption,
source: MediaSourceProxy(source: messageContent.source, mimeType: messageContent.info?.mimetype),
size: imageSize,
aspectRatio: imageAspectRatio,
thumbnailSource: thumbnailSource,
width: width,
height: height,
aspectRatio: aspectRatio,
thumbnailSize: thumbnailSize,
thumbnailAspectRatio: thumbnailAspectRatio,
blurhash: messageContent.info?.blurhash,
contentType: UTType(mimeType: messageContent.info?.mimetype, fallbackFilename: messageContent.filename))
}
@ -545,12 +569,31 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
let formattedCaption = htmlCaption != nil ? attributedStringBuilder.fromHTML(htmlCaption) : attributedStringBuilder.fromPlain(messageContent.caption)
let thumbnailSource = messageContent.info?.thumbnailSource.map { MediaSourceProxy(source: $0, mimeType: messageContent.info?.thumbnailInfo?.mimetype) }
let width = messageContent.info?.width.map(CGFloat.init)
let height = messageContent.info?.height.map(CGFloat.init)
var thumbnailSize: CGSize?
var thumbnailAspectRatio: CGFloat?
var aspectRatio: CGFloat?
if let width, let height, width > 0, height > 0 {
aspectRatio = width / height
if let thumbnailInfo = messageContent.info?.thumbnailInfo,
let height = thumbnailInfo.height,
let width = thumbnailInfo.width {
thumbnailSize = .init(width: CGFloat(width), height: CGFloat(height))
if width > 0, height > 0 {
thumbnailAspectRatio = CGFloat(width) / CGFloat(height)
}
}
var videoSize: CGSize?
var videoAspectRatio: CGFloat?
if let videoInfo = messageContent.info,
let height = videoInfo.height,
let width = videoInfo.width {
videoSize = .init(width: CGFloat(width), height: CGFloat(height))
if width > 0, height > 0 {
videoAspectRatio = CGFloat(width) / CGFloat(height)
}
}
return .init(filename: messageContent.filename,
@ -559,10 +602,11 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
formattedCaptionHTMLString: htmlCaption,
duration: messageContent.info?.duration ?? 0,
source: MediaSourceProxy(source: messageContent.source, mimeType: messageContent.info?.mimetype),
size: videoSize,
aspectRatio: videoAspectRatio,
thumbnailSource: thumbnailSource,
width: width,
height: height,
aspectRatio: aspectRatio,
thumbnailSize: thumbnailSize,
thumbnailAspectRatio: thumbnailAspectRatio,
blurhash: messageContent.info?.blurhash,
contentType: UTType(mimeType: messageContent.info?.mimetype, fallbackFilename: messageContent.filename))
}

10
ElementX/Sources/Services/Timeline/TimelineProxy.swift
View File

@ -234,7 +234,7 @@ final class TimelineProxy: TimelineProxyProtocol {
progressWatcher: UploadProgressListener { progress in
progressSubject?.send(progress)
},
useSendQueue: false)
useSendQueue: AppSettings.isDevelopmentBuild)
await requestHandle(handle)
@ -260,7 +260,7 @@ final class TimelineProxy: TimelineProxyProtocol {
progressWatcher: UploadProgressListener { progress in
progressSubject?.send(progress)
},
useSendQueue: false)
useSendQueue: AppSettings.isDevelopmentBuild)
await requestHandle(handle)
@ -290,7 +290,7 @@ final class TimelineProxy: TimelineProxyProtocol {
progressWatcher: UploadProgressListener { progress in
progressSubject?.send(progress)
},
useSendQueue: false)
useSendQueue: AppSettings.isDevelopmentBuild)
await requestHandle(handle)
@ -338,7 +338,7 @@ final class TimelineProxy: TimelineProxyProtocol {
progressWatcher: UploadProgressListener { progress in
progressSubject?.send(progress)
},
useSendQueue: false)
useSendQueue: AppSettings.isDevelopmentBuild)
await requestHandle(handle)
@ -368,7 +368,7 @@ final class TimelineProxy: TimelineProxyProtocol {
progressWatcher: UploadProgressListener { progress in
progressSubject?.send(progress)
},
useSendQueue: false)
useSendQueue: AppSettings.isDevelopmentBuild)
await requestHandle(handle)

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPad-en-GB.1.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPad-pseudo.1.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPhone-16-en-GB.1.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_imageRoomTimelineView-iPhone-16-pseudo.1.png (Stored with Git LFS)
View File

Binary file not shown.