ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for active call item rendering in timeline (#5775)

Browse Source 
* feat(timeline): Add support for active call item rendering in timeline

* Update active call as per design (show raw count of members)

* fixup project files

* revert unexpected generated mocks change

* code review

* Record preview snapshots

* revert changes on project.yml

* post rebase fix
This commit is contained in:
Valere Fedronic
2026-07-22 16:13:46 +02:00
committed by GitHub
parent 94313173f0
commit 0f72fe3511
23 changed files with 329 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/CallNotificationRoomTimelineView.swift
+49 -31
View File
@@ -14,12 +14,28 @@ struct CallNotificationRoomTimelineView: View {
let timelineItem: CallNotificationRoomTimelineItem
var body: some View {
switch timelineItem.callState {
case .tombstoned(let isDeclinedByMe, let isDeclined):
tombstonedCallView(isDeclinedByMe: isDeclinedByMe, isDeclined: isDeclined)
case .active(let activeMembers, let isJoined, let callStartTimestamp):
ActiveCallTimelineItemView(isDM: timelineItem.isDM,
isVoiceCall: timelineItem.isVoiceCall,
activeMembers: activeMembers,
sender: timelineItem.sender,
isJoined: isJoined,
callStartTimestamp: callStartTimestamp)
}
}
// MARK: - Tombstoned Call View
private func tombstonedCallView(isDeclinedByMe: Bool, isDeclined: Bool) -> some View {
HStack(spacing: 12) {
CompoundIcon(iconKeyPath, size: .medium, relativeTo: .compound.headingMDBold)
CompoundIcon(iconKeyPath(isDeclinedByMe: isDeclinedByMe, isDeclined: isDeclined), size: .medium, relativeTo: .compound.headingMDBold)
.foregroundStyle(.compound.iconSecondary)
.accessibilityHidden(true)
Text(tileTitle)
Text(tileTitle(isDeclinedByMe: isDeclinedByMe, isDeclined: isDeclined))
.font(.compound.bodyMD)
.foregroundColor(.compound.textSecondary)
.labelStyle(.custom(spacing: 4))
@@ -38,12 +54,12 @@ struct CallNotificationRoomTimelineView: View {
// MARK: - Private
private var tileTitle: String {
private func tileTitle(isDeclinedByMe: Bool, isDeclined: Bool) -> String {
if timelineItem.isDM {
// As per design only have declined variants in DM
if timelineItem.isDeclinedByMe {
if isDeclinedByMe {
L10n.commonCallYouDeclined
} else if timelineItem.isDeclined {
} else if isDeclined {
L10n.commonCallDeclined
} else {
L10n.commonCallStarted
@@ -53,8 +69,8 @@ struct CallNotificationRoomTimelineView: View {
}
}
private var iconKeyPath: KeyPath<CompoundIcons, Image> {
if timelineItem.isDM, timelineItem.isDeclined || timelineItem.isDeclinedByMe {
private func iconKeyPath(isDeclinedByMe: Bool, isDeclined: Bool) -> KeyPath<CompoundIcons, Image> {
if timelineItem.isDM, isDeclined || isDeclinedByMe {
// As per design only have declined variants in DM
timelineItem.isVoiceCall ? \.voiceCallDeclinedSolid : \.videoCallDeclinedSolid
} else {
@@ -72,68 +88,70 @@ struct CallNotificationRoomTimelineView_Previews: PreviewProvider, TestablePrevi
static var body: some View {
VStack(spacing: 0) {
// Tombstoned call previews
CallNotificationRoomTimelineView(timelineItem: .init(id: .randomEvent,
timestamp: .mock,
sender: .init(id: "@sender:localhost"),
isDM: false,
isDeclinedByMe: false,
isDeclined: false,
isVoiceCall: false))
isVoiceCall: false,
callState: .tombstoned(isDeclinedByMe: false, isDeclined: false)))
Divider()
CallNotificationRoomTimelineView(timelineItem: .init(id: .randomEvent,
timestamp: .mock,
sender: .init(id: "@sender:localhost"),
isDM: true,
isDeclinedByMe: false,
isDeclined: false,
isVoiceCall: true))
isVoiceCall: true,
callState: .tombstoned(isDeclinedByMe: false, isDeclined: false)))
Divider()
CallNotificationRoomTimelineView(timelineItem: .init(id: .randomEvent,
timestamp: .mock,
sender: .init(id: "@sender:localhost"),
isDM: false,
isDeclinedByMe: true,
isDeclined: true,
isVoiceCall: false))
isVoiceCall: false,
callState: .tombstoned(isDeclinedByMe: true, isDeclined: true)))
Divider()
CallNotificationRoomTimelineView(timelineItem: .init(id: .randomEvent,
timestamp: .mock,
sender: .init(id: "@sender:localhost"),
isDM: true,
isDeclinedByMe: false,
isDeclined: true,
isVoiceCall: true))
isVoiceCall: true,
callState: .tombstoned(isDeclinedByMe: false, isDeclined: true)))
Divider()
CallNotificationRoomTimelineView(timelineItem: .init(id: .randomEvent,
timestamp: .mock,
sender: .init(id: "@sender:localhost"),
isDM: true,
isDeclinedByMe: true,
isDeclined: true,
isVoiceCall: true))
isVoiceCall: false,
callState: .tombstoned(isDeclinedByMe: false, isDeclined: true)))
Divider()
CallNotificationRoomTimelineView(timelineItem: .init(id: .randomEvent,
timestamp: .mock,
sender: .init(id: "@sender:localhost"),
isDM: true,
isDeclinedByMe: false,
isDeclined: true,
isVoiceCall: false))
isVoiceCall: false,
callState: .tombstoned(isDeclinedByMe: true, isDeclined: true)))
Divider()
// Active call previews
CallNotificationRoomTimelineView(timelineItem: .init(id: .randomEvent,
timestamp: .mock,
isDM: true,
isDeclinedByMe: true,
isDeclined: true,
isVoiceCall: false))
Divider()
sender: .init(id: "@sender:localhost", displayName: "John"),
isDM: false,
isVoiceCall: false,
callState: .active(activeMembers: ["@alice:example.org"],
isJoined: false,
callStartTimestamp: Date())))
}
.padding()
}