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

Fix MediaFileRoomTimelineContent tap gesture taking over media event timeline taps.

Browse Source
This commit is contained in:
Stefan Ceriu 2024-12-13 17:34:19 +02:00 committed by Stefan Ceriu
parent b0f4f42ff2
commit 13875e61f8
4 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ElementX/Sources/Screens/MediaEventsTimelineScreen/View/TimelineViews/AudioFileEventsTimelineView.swift
View File

@ -12,8 +12,7 @@ struct AudioMediaEventsTimelineView: View {
let timelineItem: AudioRoomTimelineItem
var body: some View {
MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
filename: timelineItem.content.filename,
MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
fileSize: timelineItem.content.fileSize,
caption: timelineItem.content.caption,
formattedCaption: timelineItem.content.formattedCaption,

3
ElementX/Sources/Screens/MediaEventsTimelineScreen/View/TimelineViews/FileMediaEventsTimelineView.swift
View File

@ -12,8 +12,7 @@ struct FileMediaEventsTimelineView: View {
let timelineItem: FileRoomTimelineItem
var body: some View {
MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
filename: timelineItem.content.filename,
MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
fileSize: timelineItem.content.fileSize,
caption: timelineItem.content.caption,
formattedCaption: timelineItem.content.formattedCaption,

10
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/AudioRoomTimelineView.swift
View File

@ -9,18 +9,20 @@ import Foundation
import SwiftUI
struct AudioRoomTimelineView: View {
@Environment(\.timelineContext) private var context
let timelineItem: AudioRoomTimelineItem
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
filename: timelineItem.content.filename,
MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
fileSize: timelineItem.content.fileSize,
caption: timelineItem.content.caption,
formattedCaption: timelineItem.content.formattedCaption,
additionalWhitespaces: timelineItem.additionalWhitespaces(),
isAudioFile: true)
.accessibilityLabel(L10n.commonAudio)
isAudioFile: true) {
context?.send(viewAction: .mediaTapped(itemID: timelineItem.id))
}
.accessibilityLabel(L10n.commonAudio)
}
}
}

29
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FileRoomTimelineView.swift
View File

@ -9,17 +9,19 @@ import Compound
import SwiftUI
struct FileRoomTimelineView: View {
@Environment(\.timelineContext) private var context
let timelineItem: FileRoomTimelineItem
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
filename: timelineItem.content.filename,
MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
fileSize: timelineItem.content.fileSize,
caption: timelineItem.content.caption,
formattedCaption: timelineItem.content.formattedCaption,
additionalWhitespaces: timelineItem.additionalWhitespaces())
.accessibilityLabel(L10n.commonFile)
additionalWhitespaces: timelineItem.additionalWhitespaces()) {
context?.send(viewAction: .mediaTapped(itemID: timelineItem.id))
}
.accessibilityLabel(L10n.commonFile)
}
}
}
@ -27,9 +29,6 @@ struct FileRoomTimelineView: View {
// MARK: Content
struct MediaFileRoomTimelineContent: View {
@Environment(\.timelineContext) private var context
let timelineItemID: TimelineItemIdentifier
let filename: String
let fileSize: UInt?
let caption: String?
@ -37,16 +36,22 @@ struct MediaFileRoomTimelineContent: View {
let additionalWhitespaces: Int
var isAudioFile = false
var icon: KeyPath<CompoundIcons, Image> {
var onMediaTap: (() -> Void)? = nil
private var icon: KeyPath<CompoundIcons, Image> {
isAudioFile ? \.audio : \.attachment
}
var body: some View {
VStack(alignment: .leading, spacing: 8) {
filePreview
.onTapGesture {
context?.send(viewAction: .mediaTapped(itemID: timelineItemID))
}
if let onMediaTap {
filePreview
.onTapGesture {
onMediaTap()
}
} else {
filePreview
}
if let formattedCaption {
FormattedBodyText(attributedString: formattedCaption,