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
316 lines
9.5 KiB
Swift
316 lines
9.5 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2022-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
|
|
import Foundation
|
|
import UIKit
|
|
|
|
enum HomeScreenViewModelAction {
|
|
case presentRoom(roomIdentifier: String)
|
|
case detachRoom(roomIdentifier: String)
|
|
case presentRoomDetails(roomIdentifier: String)
|
|
case presentReportRoom(roomIdentifier: String)
|
|
case presentDeclineAndBlock(userID: String, roomID: String)
|
|
case presentSpace(SpaceRoomListProxyProtocol)
|
|
case roomLeft(roomIdentifier: String)
|
|
case transferOwnership(roomIdentifier: String)
|
|
case presentSecureBackupSettings
|
|
case presentRecoveryKeyScreen
|
|
case presentEncryptionResetScreen
|
|
case presentSettingsScreen
|
|
case presentFeedbackScreen
|
|
case presentStartChatScreen
|
|
case logout
|
|
}
|
|
|
|
enum HomeScreenViewAction {
|
|
case selectRoom(roomIdentifier: String)
|
|
case detachRoom(roomIdentifier: String)
|
|
case showRoomDetails(roomIdentifier: String)
|
|
case leaveRoom(roomIdentifier: String)
|
|
case confirmLeaveRoom(roomIdentifier: String)
|
|
case reportRoom(roomIdentifier: String)
|
|
case showSettings
|
|
case startChat
|
|
case setupRecovery
|
|
case confirmRecoveryKey
|
|
case resetEncryption
|
|
case skipRecoveryKeyConfirmation
|
|
case dismissNewSoundBanner
|
|
case updateVisibleItemRange(Range<Int>)
|
|
case spaceFilters
|
|
case markRoomAsUnread(roomIdentifier: String)
|
|
case markRoomAsRead(roomIdentifier: String)
|
|
case markRoomAsFavourite(roomIdentifier: String, isFavourite: Bool)
|
|
|
|
case acceptInvite(roomIdentifier: String)
|
|
case declineInvite(roomIdentifier: String)
|
|
}
|
|
|
|
enum HomeScreenRoomListMode: CustomStringConvertible {
|
|
case skeletons
|
|
case empty
|
|
case rooms
|
|
|
|
var description: String {
|
|
switch self {
|
|
case .skeletons:
|
|
return "Showing placeholders"
|
|
case .empty:
|
|
return "Showing empty state"
|
|
case .rooms:
|
|
return "Showing rooms"
|
|
}
|
|
}
|
|
}
|
|
|
|
enum HomeScreenSecurityBannerMode: Equatable {
|
|
case none
|
|
case dismissed
|
|
case show(HomeScreenRecoveryKeyConfirmationBanner.State)
|
|
|
|
var isDismissed: Bool {
|
|
switch self {
|
|
case .dismissed: true
|
|
default: false
|
|
}
|
|
}
|
|
|
|
var isShown: Bool {
|
|
switch self {
|
|
case .show: true
|
|
default: false
|
|
}
|
|
}
|
|
}
|
|
|
|
struct HomeScreenViewState: BindableState {
|
|
let userID: String
|
|
var userDisplayName: String?
|
|
var userAvatarURL: URL?
|
|
|
|
var securityBannerMode = HomeScreenSecurityBannerMode.none
|
|
var shouldShowNewSoundBanner = false
|
|
|
|
var requiresExtraAccountSetup = false
|
|
|
|
var rooms: [HomeScreenRoom] = []
|
|
var roomListMode: HomeScreenRoomListMode = .skeletons
|
|
|
|
var hasPendingInvitations = false
|
|
|
|
var selectedRoomID: String?
|
|
|
|
var hideInviteAvatars = false
|
|
|
|
var roomListActivityVisibility: RoomListActivityVisibility = .current
|
|
|
|
var reportRoomEnabled = false
|
|
|
|
var shouldShowSpaceFilters = false
|
|
var selectedSpaceFilter: SpaceServiceFilter?
|
|
|
|
var visibleRooms: [HomeScreenRoom] {
|
|
if roomListMode == .skeletons {
|
|
return placeholderRooms
|
|
}
|
|
|
|
return rooms
|
|
}
|
|
|
|
var bindings: HomeScreenViewStateBindings
|
|
|
|
var placeholderRooms: [HomeScreenRoom] {
|
|
(1...10).map { _ in
|
|
HomeScreenRoom.placeholder()
|
|
}
|
|
}
|
|
|
|
/// Used to hide all the rooms when the search field is focused and the query is empty
|
|
var shouldHideRoomList: Bool {
|
|
bindings.isSearchFieldFocused && bindings.searchQuery.isEmpty
|
|
}
|
|
|
|
var shouldShowEmptyFilterState: Bool {
|
|
!bindings.isSearchFieldFocused &&
|
|
(bindings.filtersState.isFiltering || selectedSpaceFilter != nil) &&
|
|
visibleRooms.isEmpty
|
|
}
|
|
|
|
var shouldShowFilters: Bool {
|
|
!bindings.isSearchFieldFocused && roomListMode == .rooms
|
|
}
|
|
|
|
var shouldShowBanner: Bool {
|
|
securityBannerMode.isShown || shouldShowNewSoundBanner
|
|
}
|
|
}
|
|
|
|
struct HomeScreenViewStateBindings {
|
|
var filtersState: RoomListFiltersState
|
|
var searchQuery = ""
|
|
var isSearchFieldFocused = false
|
|
|
|
var alertInfo: AlertInfo<UUID>?
|
|
var leaveRoomAlertItem: LeaveRoomAlertItem?
|
|
|
|
var spaceFiltersViewModel: ChatsSpaceFiltersScreenViewModel?
|
|
}
|
|
|
|
enum CallBadgeType {
|
|
case voice, video, none
|
|
}
|
|
|
|
struct HomeScreenRoom: Identifiable, Equatable {
|
|
enum RoomType: Equatable {
|
|
case placeholder
|
|
case room
|
|
case invite(inviterDetails: RoomInviterDetails?)
|
|
case knock
|
|
}
|
|
|
|
static let placeholderLastMessage = AttributedString("Hidden last message")
|
|
|
|
/// The list item identifier is it's room identifier.
|
|
let id: String
|
|
|
|
/// The real room identifier this item points to
|
|
let roomID: String?
|
|
|
|
let type: RoomType
|
|
|
|
var inviter: RoomInviterDetails? {
|
|
if case .invite(let inviter) = type {
|
|
return inviter
|
|
}
|
|
return nil
|
|
}
|
|
|
|
let badges: Badges
|
|
struct Badges: Equatable {
|
|
let isDotShown: Bool
|
|
let isMentionShown: Bool
|
|
let isMuteShown: Bool
|
|
let callBadgeType: CallBadgeType
|
|
}
|
|
|
|
var hasUnreads = false
|
|
|
|
let name: String
|
|
|
|
let isDirect: Bool
|
|
|
|
let isHighlighted: Bool
|
|
|
|
let isFavourite: Bool
|
|
|
|
let timestamp: String?
|
|
|
|
let lastMessage: AttributedString?
|
|
|
|
enum LastMessageState { case sending, failed }
|
|
let lastMessageState: LastMessageState?
|
|
|
|
let avatar: RoomAvatar
|
|
|
|
let canonicalAlias: String?
|
|
|
|
let isTombstoned: Bool
|
|
|
|
var displayedLastMessage: AttributedString? {
|
|
if isTombstoned {
|
|
AttributedString(L10n.screenRoomlistTombstonedRoomDescription)
|
|
} else if lastMessageState == .failed {
|
|
AttributedString(L10n.commonMessageFailedToSend)
|
|
} else {
|
|
lastMessage
|
|
}
|
|
}
|
|
|
|
static func placeholder() -> HomeScreenRoom {
|
|
HomeScreenRoom(id: UUID().uuidString,
|
|
roomID: nil,
|
|
type: .placeholder,
|
|
badges: .init(isDotShown: false, isMentionShown: false, isMuteShown: false, callBadgeType: .none),
|
|
name: "Placeholder room name",
|
|
isDirect: false,
|
|
isHighlighted: false,
|
|
isFavourite: false,
|
|
timestamp: "Now",
|
|
lastMessage: placeholderLastMessage,
|
|
lastMessageState: nil,
|
|
avatar: .room(id: "", name: "", avatarURL: nil),
|
|
canonicalAlias: nil,
|
|
isTombstoned: false)
|
|
}
|
|
}
|
|
|
|
extension HomeScreenRoom {
|
|
init(summary: RoomSummary,
|
|
roomListActivityVisibility: RoomListActivityVisibility = .current,
|
|
seenInvites: Set<String> = []) {
|
|
let roomID = summary.id
|
|
|
|
let isUnseenInvite = summary.joinRequestType?.isInvite == true && !seenInvites.contains(roomID)
|
|
|
|
let isDotShown = switch roomListActivityVisibility {
|
|
case .current:
|
|
summary.hasUnreadMessages || summary.hasUnreadMentions || summary.hasUnreadNotifications || summary.isMarkedUnread || isUnseenInvite
|
|
case .hide, .show:
|
|
(!summary.isMuted && (summary.hasUnreadNotifications || summary.hasUnreadMentions)) || summary.isMarkedUnread || isUnseenInvite
|
|
}
|
|
|
|
let isMentionShown = summary.hasUnreadMentions && !summary.isMuted
|
|
let isMuteShown = summary.isMuted
|
|
let isHighlighted = summary.isMarkedUnread || (!summary.isMuted && (summary.hasUnreadNotifications || summary.hasUnreadMentions)) || isUnseenInvite
|
|
|
|
let callBadge = if summary.hasOngoingCall {
|
|
summary.activeCallIntent == .audio ? CallBadgeType.voice : CallBadgeType.video
|
|
} else { CallBadgeType.none }
|
|
|
|
let type: HomeScreenRoom.RoomType = switch summary.joinRequestType {
|
|
case .invite(let inviter): .invite(inviterDetails: inviter.map(RoomInviterDetails.init))
|
|
case .knock: .knock
|
|
case .none: .room
|
|
}
|
|
|
|
self.init(id: roomID,
|
|
roomID: summary.id,
|
|
type: type,
|
|
badges: .init(isDotShown: isDotShown,
|
|
isMentionShown: isMentionShown,
|
|
isMuteShown: isMuteShown,
|
|
callBadgeType: callBadge),
|
|
hasUnreads: summary.hasUnreadMessages,
|
|
name: summary.name,
|
|
isDirect: summary.isDirect,
|
|
isHighlighted: isHighlighted,
|
|
isFavourite: summary.isFavourite,
|
|
timestamp: summary.lastMessageDate?.formattedMinimal(),
|
|
lastMessage: summary.lastMessage,
|
|
lastMessageState: summary.homeScreenLastMessageState,
|
|
avatar: summary.avatar,
|
|
canonicalAlias: summary.canonicalAlias,
|
|
isTombstoned: summary.isTombstoned)
|
|
}
|
|
}
|
|
|
|
private extension RoomSummary {
|
|
var homeScreenLastMessageState: HomeScreenRoom.LastMessageState? {
|
|
if isTombstoned {
|
|
nil
|
|
} else {
|
|
switch lastMessageState {
|
|
case .sending: .sending
|
|
case .failed: .failed
|
|
case .none: .none
|
|
}
|
|
}
|
|
}
|
|
}
|