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 rooms list.

Browse Source
This commit is contained in:
Doug
2026-07-10 13:59:58 +01:00
committed by Doug
parent 7b1333c9b8
commit 23b3fc62cb
3 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
+4
View File
@@ -219,6 +219,8 @@ struct HomeScreenRoom: Identifiable, Equatable {
let avatar: RoomAvatar
let statusEmoji: Character?
let canonicalAlias: String?
let isTombstoned: Bool
@@ -246,6 +248,7 @@ struct HomeScreenRoom: Identifiable, Equatable {
lastMessage: placeholderLastMessage,
lastMessageState: nil,
avatar: .room(id: "", name: "", avatarURL: nil),
statusEmoji: nil,
canonicalAlias: nil,
isTombstoned: false)
}
@@ -298,6 +301,7 @@ extension HomeScreenRoom {
lastMessage: summary.lastMessage,
lastMessageState: summary.homeScreenLastMessageState,
avatar: summary.avatar,
statusEmoji: summary.statusEmoji,
canonicalAlias: summary.canonicalAlias,
isTombstoned: summary.isTombstoned)
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
+32 -10
View File
@@ -74,11 +74,17 @@ struct HomeScreenRoomCell: View {
private var header: some View {
HStack(alignment: .top, spacing: 16) {
Text(room.name)
.font(headerFont)
.foregroundColor(.compound.textPrimary)
.lineLimit(1)
.frame(maxWidth: .infinity, alignment: .leading)
HStack(spacing: 4) {
Text(room.name)
.lineLimit(1)
if let statusEmoji = room.statusEmoji {
Text(String(statusEmoji))
}
}
.font(headerFont)
.foregroundColor(.compound.textPrimary)
.frame(maxWidth: .infinity, alignment: .leading)
if let timestamp = room.timestamp {
Text(timestamp)
@@ -218,6 +224,8 @@ struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
static let lastMessageStateRooms = [makeRoom(lastMessageState: .sending), makeRoom(lastMessageState: .failed)]
static let roomHeroRooms = [makeRoom(heroes: [.mockDan]), makeRoom(heroes: [.mockErin])]
static var previews: some View {
VStack(spacing: 0) {
ForEach(genericRooms) { room in
@@ -244,6 +252,14 @@ struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
}
.previewLayout(.sizeThatFits)
.previewDisplayName("Last Message State")
VStack(spacing: 0) {
ForEach(roomHeroRooms) { room in
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
}
}
.previewLayout(.sizeThatFits)
.previewDisplayName("Room Heroes")
}
static func mockRoom(summary: RoomSummary) -> HomeScreenRoom? {
@@ -261,15 +277,21 @@ struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
userIndicatorController: UserIndicatorControllerMock())
}
static func makeRoom(lastMessageState: RoomSummary.LastMessageState) -> HomeScreenRoom {
static func makeRoom(lastMessageState: RoomSummary.LastMessageState? = nil,
heroes: [UserProfile] = []) -> HomeScreenRoom {
let name = if heroes.count == 1 {
heroes[0].displayName ?? heroes[0].id
} else {
"Foundation and Empire"
}
let summary = RoomSummary(room: RoomSDKMock(),
id: UUID().uuidString,
joinRequestType: nil,
name: "Foundation and Empire",
isDirect: false,
name: name,
isDirect: heroes.count == 1,
isSpace: false,
avatarURL: .mockMXCAvatar,
heroes: [],
avatarURL: heroes.count == 1 ? nil : .mockMXCAvatar,
heroes: heroes,
activeMembersCount: 0,
lastMessage: AttributedString("How do you see the Emperor then? You think he keeps office hours?"),
lastMessageDate: .mock,