ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 12:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show user statuses in the timeline.

Browse Source
This commit is contained in:
Doug
2026-07-10 13:00:47 +01:00
committed by Doug
parent bbe6931906
commit 64908ae642
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
+12 -5
View File
@@ -54,7 +54,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
var body: some View {
ZStack(alignment: .trailingFirstTextBaseline) {
VStack(alignment: alignment, spacing: -12) {
VStack(alignment: alignment, spacing: -8) {
if !timelineItem.isOutgoing, !isDM {
header
.zIndex(1)
@@ -94,19 +94,26 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
if shouldShowSenderDetails {
HStack(alignment: .top, spacing: 4) {
TimelineSenderAvatarView(timelineItem: timelineItem)
HStack(alignment: .center, spacing: 4) {
Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
.font(.compound.bodySMSemibold)
.foregroundColor(.compound.decorativeColor(for: timelineItem.sender.id).text)
.font(.compound.bodyMDSemibold)
.foregroundStyle(.compound.decorativeColor(for: timelineItem.sender.id).text)
if let statusEmoji = timelineItem.sender.status.displayed?.emoji {
Text(String(statusEmoji))
.font(.compound.bodyMDSemibold)
.foregroundStyle(.compound.textPrimary)
}
if timelineItem.sender.displayName != nil, timelineItem.sender.isDisplayNameAmbiguous {
Text(timelineItem.sender.id)
.font(.compound.bodyXS)
.foregroundColor(.compound.textSecondary)
.foregroundStyle(.compound.textSecondary)
}
}
.lineLimit(1)
.scaledPadding(.vertical, 3)
.scaledPadding(.top, 3)
}
// sender info are read inside the `TimelineAccessibilityModifier`
.accessibilityHidden(true)
ElementX/Sources/Screens/Timeline/View/TimelineSenderAvatarView.swift
+4 -1
View File
@@ -6,6 +6,7 @@
// Please see LICENSE files in the repository root for full details.
//
import Compound
import Foundation
import SwiftUI
@@ -21,7 +22,9 @@ struct TimelineSenderAvatarView: View {
avatarSize: .user(on: .timeline),
mediaProvider: context?.mediaProvider)
.overlay {
Circle().stroke(Color.compound.bgCanvasDefault, lineWidth: 3)
Circle()
.inset(by: -1)
.stroke(.compound.bgCanvasDefault, lineWidth: 2)
}
}
}
ElementX/Sources/Services/Timeline/Fixtures/TimelineFixtures.swift
+1 -1
View File
@@ -19,7 +19,7 @@ enum TimelineFixtures {
isOutgoing: false,
isEditable: false,
canBeRepliedTo: true,
sender: .init(id: "", displayName: "Jacob"),
sender: .init(id: "", displayName: "Jacob", status: .mock(text: "Rowing", emoji: "🚣‍♂️")),
content: .init(body: "That looks so good!"),
properties: RoomTimelineItemProperties(isEdited: true)),
TextRoomTimelineItem(id: .event(uniqueID: .init("TimelineFixtures.default.1"),