b16bbdcc72
1. I removed the grey dots for when there is activity in rooms set to mentions or mute. 2. For all unread rooms, I made the message preview text bold for better legibility 3. For rooms with no unreads, I made the font weight regular, again for legibility We have also mergeg the new room list activity rendering with the existing feature hide unread badge feature flag and provide 3 variations: current production behavior, no badge but bolding, and no bolding and no badge
264 lines
9.9 KiB
Swift
264 lines
9.9 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2024-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
@testable import ElementX
|
|
import Testing
|
|
|
|
@MainActor
|
|
struct HomeScreenRoomTests {
|
|
var roomSummary: RoomSummary!
|
|
|
|
mutating func setupRoomSummary(isMarkedUnread: Bool,
|
|
unreadMessagesCount: UInt,
|
|
unreadMentionsCount: UInt,
|
|
unreadNotificationsCount: UInt,
|
|
notificationMode: RoomNotificationModeProxy,
|
|
hasOngoingCall: Bool,
|
|
activeCallIntent: CallIntent? = nil) {
|
|
roomSummary = RoomSummary(room: .init(noHandle: .init()),
|
|
id: "Test room",
|
|
joinRequestType: nil,
|
|
name: "Test room",
|
|
isDirect: false,
|
|
isSpace: false,
|
|
avatarURL: nil,
|
|
heroes: [],
|
|
activeMembersCount: 0,
|
|
lastMessage: nil,
|
|
lastMessageDate: nil,
|
|
lastMessageState: nil,
|
|
unreadMessagesCount: unreadMessagesCount,
|
|
unreadMentionsCount: unreadMentionsCount,
|
|
unreadNotificationsCount: unreadNotificationsCount,
|
|
notificationMode: notificationMode,
|
|
canonicalAlias: nil,
|
|
alternativeAliases: [],
|
|
hasOngoingCall: hasOngoingCall,
|
|
activeCallIntent: activeCallIntent,
|
|
isMarkedUnread: isMarkedUnread,
|
|
isFavourite: false,
|
|
isTombstoned: false)
|
|
}
|
|
|
|
@Test
|
|
mutating func noBadge() {
|
|
setupRoomSummary(isMarkedUnread: false,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(!room.isHighlighted)
|
|
#expect(!room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func allBadgesExceptMute() {
|
|
setupRoomSummary(isMarkedUnread: true,
|
|
unreadMessagesCount: 5,
|
|
unreadMentionsCount: 5,
|
|
unreadNotificationsCount: 5,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: true)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .video)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func voiceCallBadge() {
|
|
setupRoomSummary(isMarkedUnread: true,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: true,
|
|
activeCallIntent: .audio)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(room.badges.callBadgeType == .voice)
|
|
}
|
|
|
|
@Test
|
|
mutating func unhighlightedDot() {
|
|
setupRoomSummary(isMarkedUnread: false,
|
|
unreadMessagesCount: 5,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(!room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func highlightedDot() {
|
|
setupRoomSummary(isMarkedUnread: false,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 5,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func highlightedMentionAndDot() {
|
|
setupRoomSummary(isMarkedUnread: false,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 5,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func unhighlightedCall() {
|
|
setupRoomSummary(isMarkedUnread: false,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: true)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(!room.isHighlighted)
|
|
#expect(!room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .video)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func mentionAndKeywordsUnhighlightedDot() {
|
|
setupRoomSummary(isMarkedUnread: false,
|
|
unreadMessagesCount: 10,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .mentionsAndKeywordsOnly,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(!room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func mentionAndKeywordsUnhighlightedDotHidden() {
|
|
setupRoomSummary(isMarkedUnread: false,
|
|
unreadMessagesCount: 10,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .mentionsAndKeywordsOnly,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary, roomListActivityVisibility: .show)
|
|
|
|
#expect(!room.isHighlighted)
|
|
#expect(!room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
|
|
// MARK: - Mark unread
|
|
|
|
@Test
|
|
mutating func markedUnreadDot() {
|
|
setupRoomSummary(isMarkedUnread: true,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func markedUnreadDotAndMention() {
|
|
setupRoomSummary(isMarkedUnread: true,
|
|
unreadMessagesCount: 0,
|
|
unreadMentionsCount: 5,
|
|
unreadNotificationsCount: 0,
|
|
notificationMode: .allMessages,
|
|
hasOngoingCall: false)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .none)
|
|
#expect(!room.badges.isMuteShown)
|
|
#expect(room.badges.isMentionShown)
|
|
}
|
|
|
|
@Test
|
|
mutating func markedUnreadMuteDotAndCall() {
|
|
setupRoomSummary(isMarkedUnread: true,
|
|
unreadMessagesCount: 5,
|
|
unreadMentionsCount: 5,
|
|
unreadNotificationsCount: 5,
|
|
notificationMode: .mute,
|
|
hasOngoingCall: true)
|
|
|
|
let room = HomeScreenRoom(summary: roomSummary)
|
|
|
|
#expect(room.isHighlighted)
|
|
#expect(room.badges.isDotShown)
|
|
#expect(room.badges.callBadgeType == .video)
|
|
#expect(room.badges.isMuteShown)
|
|
#expect(!room.badges.isMentionShown)
|
|
}
|
|
}
|