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

Show user statuses in mention pills.

Browse Source
This commit is contained in:
Doug
2026-07-10 13:13:50 +01:00
committed by Doug
parent 01b946926f
commit 6199ab596f
7 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Pills/PillAttachmentViewProvider.swift
+2 -1
View File
@@ -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 {
ElementX/Sources/Other/Pills/PillContext.swift
+19 -10
View File
@@ -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
}
}
}
ElementX/Sources/Other/Pills/PillView.swift
+34 -12
View File
@@ -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)
ElementX/Sources/Other/Pills/PillViewOnBubblePreviews.swift
+2 -1
View File
@@ -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)
}
}