From 6199ab596fa4fddb2ffcfa099489fbfdcd34329b Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 10 Jul 2026 13:13:50 +0100 Subject: [PATCH] Show user statuses in mention pills. --- .../Pills/PillAttachmentViewProvider.swift | 3 +- .../Sources/Other/Pills/PillContext.swift | 29 ++++++++---- ElementX/Sources/Other/Pills/PillView.swift | 46 ++++++++++++++----- .../Pills/PillViewOnBubblePreviews.swift | 3 +- .../Screens/Timeline/TimelineModels.swift | 1 + .../Screens/Timeline/TimelineViewModel.swift | 16 +++++-- .../View/ReadReceipts/ReadReceiptCell.swift | 6 ++- 7 files changed, 73 insertions(+), 31 deletions(-) diff --git a/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift b/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift index b8038b4c6..54206fb2e 100644 --- a/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift +++ b/ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift @@ -52,7 +52,8 @@ final class PillAttachmentViewProvider: NSTextAttachmentViewProvider, NSSecureCo let context: PillContext if ProcessInfo.isXcodePreview || ProcessInfo.isRunningTests { // The mock viewModel simulates the loading logic for testing purposes - context = PillContext.mock(viewState: .mention(isOwnMention: false, displayText: "Alice"), delay: .seconds(2)) + context = PillContext.mock(viewState: .mention(isOwnMention: false, displayText: "Alice", statusEmoji: nil), + delay: .seconds(2)) } else if let timelineContext = provider.delegate?.timelineContext { context = PillContext(timelineContext: timelineContext, data: pillData) } else { diff --git a/ElementX/Sources/Other/Pills/PillContext.swift b/ElementX/Sources/Other/Pills/PillContext.swift index 57d623d74..a186243a4 100644 --- a/ElementX/Sources/Other/Pills/PillContext.swift +++ b/ElementX/Sources/Other/Pills/PillContext.swift @@ -26,7 +26,7 @@ extension PillContext { // This is just for previews so the internal data doesn't really matter let viewModel = PillContext(timelineContext: TimelineViewModel.mock.context, data: PillTextAttachmentData(type: .allUsers, font: .preferredFont(forTextStyle: .body))) if let delay { - viewModel.viewState = .mention(isOwnMention: false, displayText: "placeholder") + viewModel.viewState = .mention(isOwnMention: false, displayText: "placeholder", statusEmoji: nil) Task { try? await Task.sleep(for: delay) viewModel.viewState = viewState @@ -39,34 +39,43 @@ extension PillContext { } enum PillViewState: Equatable { - case mention(isOwnMention: Bool, displayText: String) + case mention(isOwnMention: Bool, displayText: String, statusEmoji: Character?) case reference(displayText: String) case undefined var isOwnMention: Bool { switch self { - case .mention(let isOwnMention, _): - return isOwnMention + case .mention(let isOwnMention, _, _): + isOwnMention default: - return false + false } } var displayText: String { switch self { - case .mention(_, let displayText), .reference(let displayText): - return displayText + case .mention(_, let displayText, _), .reference(let displayText): + displayText case .undefined: - return "" + "" + } + } + + var statusEmoji: Character? { + switch self { + case .mention(_, _, let statusEmoji): + statusEmoji + default: + nil } } var isUndefined: Bool { switch self { case .undefined: - return true + true default: - return false + false } } } diff --git a/ElementX/Sources/Other/Pills/PillView.swift b/ElementX/Sources/Other/Pills/PillView.swift index ef4f511bf..e2846e682 100644 --- a/ElementX/Sources/Other/Pills/PillView.swift +++ b/ElementX/Sources/Other/Pills/PillView.swift @@ -30,14 +30,20 @@ struct PillView: View { } private var mainContent: some View { - Text(context.viewState.displayText) - .font(.compound.bodyLGSemibold) - .foregroundColor(textColor) - .lineLimit(1) - .padding(.leading, 4) - .padding(.trailing, 6) - .padding(.vertical, 1) - .background { Capsule().foregroundColor(backgroundColor) } + HStack(spacing: 4) { + Text(context.viewState.displayText) + .lineLimit(1) + + if let emoji = context.viewState.statusEmoji { + Text(String(emoji)) + } + } + .font(.compound.bodyLGSemibold) + .foregroundColor(textColor) + .padding(.leading, 4) + .padding(.trailing, 6) + .padding(.vertical, 1) + .background(backgroundColor, in: .capsule) } } @@ -47,22 +53,38 @@ struct PillView_Previews: PreviewProvider, TestablePreview { static var previews: some View { PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false, displayText: PillUtilities.userPillDisplayText(username: "User", - userID: "@alice:matrix.org")))) { } + userID: "@alice:matrix.org"), + statusEmoji: nil))) { } .frame(maxWidth: PillUtilities.mockMaxWidth) .previewDisplayName("User") PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false, displayText: PillUtilities.userPillDisplayText(username: "Alice but with a very long name", - userID: "@alice:matrix.org")))) { } + userID: "@alice:matrix.org"), + statusEmoji: nil))) { } .frame(maxWidth: PillUtilities.mockMaxWidth) .previewDisplayName("User with a long name") PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false, - displayText: PillUtilities.userPillDisplayText(username: nil, userID: "@alice:matrix.org")))) { } + displayText: PillUtilities.userPillDisplayText(username: nil, userID: "@alice:matrix.org"), + statusEmoji: nil))) { } .frame(maxWidth: PillUtilities.mockMaxWidth) .previewDisplayName("User with missing name") PillView(context: PillContext.mock(viewState: .mention(isOwnMention: true, - displayText: PillUtilities.userPillDisplayText(username: "Alice", userID: "@alice:matrix.org")))) { } + displayText: PillUtilities.userPillDisplayText(username: "Alice", userID: "@alice:matrix.org"), + statusEmoji: nil))) { } .frame(maxWidth: PillUtilities.mockMaxWidth) .previewDisplayName("Own user") + PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false, + displayText: PillUtilities.userPillDisplayText(username: "User", + userID: "@alice:matrix.org"), + statusEmoji: "🎂"))) { } + .frame(maxWidth: PillUtilities.mockMaxWidth) + .previewDisplayName("User with Status") + PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false, + displayText: PillUtilities.userPillDisplayText(username: "Alice but with a very long name", + userID: "@alice:matrix.org"), + statusEmoji: "🚆"))) { } + .frame(maxWidth: PillUtilities.mockMaxWidth) + .previewDisplayName("User with status and long name") PillView(context: PillContext.mock(viewState: .reference(displayText: PillUtilities.roomPillDisplayText(roomName: "Room", rawRoomText: "#room:matrix.org")))) { } .frame(maxWidth: PillUtilities.mockMaxWidth) diff --git a/ElementX/Sources/Other/Pills/PillViewOnBubblePreviews.swift b/ElementX/Sources/Other/Pills/PillViewOnBubblePreviews.swift index e2c735462..2a37b975e 100644 --- a/ElementX/Sources/Other/Pills/PillViewOnBubblePreviews.swift +++ b/ElementX/Sources/Other/Pills/PillViewOnBubblePreviews.swift @@ -48,6 +48,7 @@ struct PillViewOnBubble_Previews: PreviewProvider, TestablePreview { static func makeViewState(isOwnMention: Bool) -> PillViewState { .mention(isOwnMention: isOwnMention, displayText: PillUtilities.userPillDisplayText(username: isOwnMention ? "Alice" : "Bob", - userID: isOwnMention ? "@alice:matrix.org" : "@bob:matrix.org")) + userID: isOwnMention ? "@alice:matrix.org" : "@bob:matrix.org"), + statusEmoji: nil) } } diff --git a/ElementX/Sources/Screens/Timeline/TimelineModels.swift b/ElementX/Sources/Screens/Timeline/TimelineModels.swift index 89382ff34..51bf92408 100644 --- a/ElementX/Sources/Screens/Timeline/TimelineModels.swift +++ b/ElementX/Sources/Screens/Timeline/TimelineModels.swift @@ -228,6 +228,7 @@ enum TimelineAlertInfoType: Hashable { struct RoomMemberState { let displayName: String? let avatarURL: URL? + let status: UserStatus } /// Used as the state for the TimelineView, to avoid having the context continuously refresh the list of items on each small change. diff --git a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift index ea60787d1..9a05f3e4f 100644 --- a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift +++ b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift @@ -425,7 +425,9 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol { private func updateMembers(_ members: [RoomMemberProxyProtocol]) { state.members = members.reduce(into: [String: RoomMemberState]()) { dictionary, member in - dictionary[member.userID] = RoomMemberState(displayName: member.displayName, avatarURL: member.avatarURL) + dictionary[member.userID] = RoomMemberState(displayName: member.displayName, + avatarURL: member.avatarURL, + status: member.status) if member.userID == roomProxy.ownUserID { currentUserProxy = member } @@ -1010,21 +1012,25 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol { case let .user(id): let isOwnMention = id == state.ownUserID if let profile = state.members[id] { - pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: PillUtilities.userPillDisplayText(username: profile.displayName, userID: id)) + pillContext.viewState = .mention(isOwnMention: isOwnMention, + displayText: PillUtilities.userPillDisplayText(username: profile.displayName, userID: id), + statusEmoji: profile.status.displayed?.emoji) } else { - pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: id) + pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: id, statusEmoji: nil) pillContext.cancellable = context.$viewState .compactMap { $0.members[id] } .sink { [weak pillContext] profile in guard let pillContext else { return } - pillContext.viewState = .mention(isOwnMention: isOwnMention, displayText: PillUtilities.userPillDisplayText(username: profile.displayName, userID: id)) + pillContext.viewState = .mention(isOwnMention: isOwnMention, + displayText: PillUtilities.userPillDisplayText(username: profile.displayName, userID: id), + statusEmoji: profile.status.displayed?.emoji) pillContext.cancellable = nil } } case .allUsers: - pillContext.viewState = .mention(isOwnMention: true, displayText: PillUtilities.atRoom) + pillContext.viewState = .mention(isOwnMention: true, displayText: PillUtilities.atRoom, statusEmoji: nil) case .event(let room): let pillViewState: PillViewState switch room { diff --git a/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptCell.swift b/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptCell.swift index 970aa9116..dcd02bd0c 100644 --- a/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptCell.swift +++ b/ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptCell.swift @@ -63,13 +63,15 @@ struct ReadReceiptCell_Previews: PreviewProvider, TestablePreview { ReadReceiptCell(readReceipt: .init(userID: "@test:matrix.org", formattedTimestamp: "10:00"), memberState: .init(displayName: "Test", - avatarURL: nil), + avatarURL: nil, + status: .init()), mediaProvider: MediaProviderMock(.init())) .previewDisplayName("No Image") ReadReceiptCell(readReceipt: .init(userID: "@test:matrix.org", formattedTimestamp: "10:00"), memberState: .init(displayName: "Test", - avatarURL: .mockMXCUserAvatar), + avatarURL: .mockMXCUserAvatar, + status: .init()), mediaProvider: MediaProviderMock(.init())) .previewDisplayName("With Image") ReadReceiptCell(readReceipt: .init(userID: "@test:matrix.org",