generated from element-hq/.github
-
Notifications
You must be signed in to change notification settings - Fork 129
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Custom media gallery views for files and voice messages (#3610)
* Extract the timeline item background from the BubbledStyler. * Use different views for files and voices messages, reuse the timeline content but only keep the bubble background instead of the whole TimelineStyler. * Add back max voice message width and add missing accessibility label
- Loading branch information
1 parent
88b5426
commit 256ae4d
Showing
31 changed files
with
398 additions
and
91 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...es/Screens/MediaEventsTimelineScreen/View/TimelineViews/AudioFileEventsTimelineView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| // | ||
| // Copyright 2023, 2024 New Vector Ltd. | ||
| // | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| // Please see LICENSE in the repository root for full details. | ||
| // | ||
|
|
||
| import Compound | ||
| import SwiftUI | ||
|
|
||
| struct AudioMediaEventsTimelineView: View { | ||
| let timelineItem: AudioRoomTimelineItem | ||
|
|
||
| var body: some View { | ||
| MediaFileRoomTimelineContent(timelineItemID: timelineItem.id, | ||
| filename: timelineItem.content.filename, | ||
| fileSize: timelineItem.content.fileSize, | ||
| caption: timelineItem.content.caption, | ||
| formattedCaption: timelineItem.content.formattedCaption, | ||
| additionalWhitespaces: timelineItem.additionalWhitespaces(), | ||
| isAudioFile: true) | ||
| .accessibilityLabel(L10n.commonAudio) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| .bubbleBackground(timelineItem: timelineItem, | ||
| insets: .init(top: 8, leading: 12, bottom: 8, trailing: 12), | ||
| color: .compound.bgSubtleSecondary) | ||
| } | ||
| } | ||
|
|
||
| struct AudioMediaEventsTimelineView_Previews: PreviewProvider, TestablePreview { | ||
| static let viewModel = TimelineViewModel.mock | ||
|
|
||
| static var previews: some View { | ||
| VStack(spacing: 20) { | ||
| AudioMediaEventsTimelineView(timelineItem: makeItem(filename: "audio.ogg", | ||
| fileSize: 2 * 1024 * 1024)) | ||
|
|
||
| AudioMediaEventsTimelineView(timelineItem: makeItem(filename: "Best Song Ever.mp3", | ||
| fileSize: 7 * 1024 * 1024, | ||
| caption: "This song rocks!")) | ||
| } | ||
| .environmentObject(viewModel.context) | ||
| } | ||
|
|
||
| static func makeItem(filename: String, fileSize: UInt, caption: String? = nil) -> AudioRoomTimelineItem { | ||
| .init(id: .randomEvent, | ||
| timestamp: .mock, | ||
| isOutgoing: false, | ||
| isEditable: false, | ||
| canBeRepliedTo: true, | ||
| isThreaded: false, | ||
| sender: .init(id: "Bob"), | ||
| content: .init(filename: filename, | ||
| caption: caption, | ||
| duration: 300, | ||
| waveform: nil, | ||
| source: nil, | ||
| fileSize: fileSize, | ||
| contentType: nil)) | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
...es/Screens/MediaEventsTimelineScreen/View/TimelineViews/FileMediaEventsTimelineView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // | ||
| // Copyright 2022-2024 New Vector Ltd. | ||
| // | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| // Please see LICENSE in the repository root for full details. | ||
| // | ||
|
|
||
| import Compound | ||
| import SwiftUI | ||
|
|
||
| struct FileMediaEventsTimelineView: View { | ||
| let timelineItem: FileRoomTimelineItem | ||
|
|
||
| var body: some View { | ||
| MediaFileRoomTimelineContent(timelineItemID: timelineItem.id, | ||
| filename: timelineItem.content.filename, | ||
| fileSize: timelineItem.content.fileSize, | ||
| caption: timelineItem.content.caption, | ||
| formattedCaption: timelineItem.content.formattedCaption, | ||
| additionalWhitespaces: timelineItem.additionalWhitespaces()) | ||
| .accessibilityLabel(L10n.commonFile) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| .bubbleBackground(timelineItem: timelineItem, | ||
| insets: .init(top: 8, leading: 12, bottom: 8, trailing: 12), | ||
| color: .compound.bgSubtleSecondary) | ||
| } | ||
| } | ||
|
|
||
| struct FileMediaEventsTimelineView_Previews: PreviewProvider, TestablePreview { | ||
| static let viewModel = TimelineViewModel.mock | ||
|
|
||
| static var previews: some View { | ||
| VStack(spacing: 20.0) { | ||
| FileMediaEventsTimelineView(timelineItem: makeItem(filename: "document.pdf")) | ||
|
|
||
| FileMediaEventsTimelineView(timelineItem: makeItem(filename: "document.pdf", | ||
| fileSize: 3 * 1024 * 1024)) | ||
|
|
||
| FileMediaEventsTimelineView(timelineItem: makeItem(filename: "spreadsheet.xlsx", | ||
| fileSize: 17 * 1024, | ||
| caption: "The important figures you asked me to send over.")) | ||
|
|
||
| FileMediaEventsTimelineView(timelineItem: makeItem(filename: "document.txt", | ||
| fileSize: 456, | ||
| caption: "Plain caption", | ||
| formattedCaption: "Formatted caption")) | ||
| } | ||
| .environmentObject(viewModel.context) | ||
| } | ||
|
|
||
| static func makeItem(filename: String, | ||
| fileSize: UInt? = nil, | ||
| caption: String? = nil, | ||
| formattedCaption: AttributedString? = nil) -> FileRoomTimelineItem { | ||
| .init(id: .randomEvent, | ||
| timestamp: .mock, | ||
| isOutgoing: false, | ||
| isEditable: false, | ||
| canBeRepliedTo: true, | ||
| isThreaded: false, | ||
| sender: .init(id: "Bob"), | ||
| content: .init(filename: filename, | ||
| caption: caption, | ||
| formattedCaption: formattedCaption, | ||
| source: nil, | ||
| fileSize: fileSize, | ||
| thumbnailSource: nil, | ||
| contentType: nil)) | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
...ns/MediaEventsTimelineScreen/View/TimelineViews/VoiceMessageMediaEventsTimelineView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // | ||
| // Copyright 2023, 2024 New Vector Ltd. | ||
| // | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| // Please see LICENSE in the repository root for full details. | ||
| // | ||
|
|
||
| import Compound | ||
| import SwiftUI | ||
|
|
||
| struct VoiceMessageMediaEventsTimelineView: View { | ||
| let timelineItem: VoiceMessageRoomTimelineItem | ||
| let playerState: AudioPlayerState | ||
|
|
||
| var body: some View { | ||
| VoiceMessageRoomTimelineContent(timelineItem: timelineItem, | ||
| playerState: playerState) | ||
| .accessibilityLabel(L10n.commonVoiceMessage) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| .bubbleBackground(timelineItem: timelineItem, | ||
| insets: .init(top: 8, leading: 12, bottom: 8, trailing: 12), | ||
| color: .compound.bgSubtleSecondary) | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Content | ||
|
|
||
| struct VoiceMessageMediaEventsTimelineView_Previews: PreviewProvider, TestablePreview { | ||
| static let viewModel = TimelineViewModel.mock | ||
| static let timelineItemIdentifier = TimelineItemIdentifier.randomEvent | ||
| static let voiceRoomTimelineItem = VoiceMessageRoomTimelineItem(id: timelineItemIdentifier, | ||
| timestamp: .mock, | ||
| isOutgoing: false, | ||
| isEditable: false, | ||
| canBeRepliedTo: true, | ||
| isThreaded: false, | ||
| sender: .init(id: "Bob"), | ||
| content: .init(filename: "audio.ogg", | ||
| duration: 300, | ||
| waveform: EstimatedWaveform.mockWaveform, | ||
| source: nil, | ||
| fileSize: nil, | ||
| contentType: nil)) | ||
|
|
||
| static let playerState = AudioPlayerState(id: .timelineItemIdentifier(timelineItemIdentifier), | ||
| title: L10n.commonVoiceMessage, | ||
| duration: 10.0, | ||
| waveform: EstimatedWaveform.mockWaveform, | ||
| progress: 0.4) | ||
|
|
||
| static var previews: some View { | ||
| body | ||
| .environmentObject(viewModel.context) | ||
| } | ||
|
|
||
| static var body: some View { | ||
| VoiceMessageMediaEventsTimelineView(timelineItem: voiceRoomTimelineItem, playerState: playerState) | ||
| .fixedSize(horizontal: false, vertical: true) | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbleBackground.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // | ||
| // Copyright 2024 New Vector Ltd. | ||
| // | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| // Please see LICENSE in the repository root for full details. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| extension View { | ||
| func bubbleBackground(timelineItem: EventBasedTimelineItemProtocol, | ||
| insets: EdgeInsets, | ||
| color: Color? = nil) -> some View { | ||
| modifier(TimelineItemBubbleBackgroundModifier(timelineItem: timelineItem, | ||
| insets: insets, | ||
| color: color)) | ||
| } | ||
| } | ||
|
|
||
| private struct TimelineItemBubbleBackgroundModifier: ViewModifier { | ||
| @Environment(\.timelineGroupStyle) private var timelineGroupStyle | ||
|
|
||
| let timelineItem: EventBasedTimelineItemProtocol | ||
| let insets: EdgeInsets | ||
| var color: Color? | ||
|
|
||
| func body(content: Content) -> some View { | ||
| content | ||
| .padding(insets) | ||
| .background(color) | ||
| .cornerRadius(12, corners: roundedCorners) | ||
| } | ||
|
|
||
| private var roundedCorners: UIRectCorner { | ||
| switch timelineGroupStyle { | ||
| case .single: | ||
| return .allCorners | ||
| case .first: | ||
| if timelineItem.isOutgoing { | ||
| return [.topLeft, .topRight, .bottomLeft] | ||
| } else { | ||
| return [.topLeft, .topRight, .bottomRight] | ||
| } | ||
| case .middle: | ||
| return timelineItem.isOutgoing ? [.topLeft, .bottomLeft] : [.topRight, .bottomRight] | ||
| case .last: | ||
| if timelineItem.isOutgoing { | ||
| return [.topLeft, .bottomLeft, .bottomRight] | ||
| } else { | ||
| return [.topRight, .bottomLeft, .bottomRight] | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.