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
107 lines
4.8 KiB
Swift
107 lines
4.8 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-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 SwiftUI
|
|
|
|
struct HomeScreenRoomList: View {
|
|
@Environment(\.supportsMultipleWindows) private var supportsMultipleWindows
|
|
|
|
@ObservedObject var context: HomeScreenViewModel.Context
|
|
|
|
var body: some View {
|
|
// Hide the room list when the search bar is focused but the query is empty
|
|
// This works hand in hand with the room list service layer filtering and
|
|
// avoids glitches when focusing the search bar
|
|
if !context.viewState.shouldHideRoomList {
|
|
content
|
|
}
|
|
}
|
|
|
|
private var content: some View {
|
|
ForEach(context.viewState.visibleRooms) { room in
|
|
switch room.type {
|
|
case .placeholder:
|
|
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: context.mediaProvider, action: context.send)
|
|
.redacted(reason: .placeholder)
|
|
case .invite:
|
|
HomeScreenInviteCell(room: room, context: context, hideInviteAvatars: context.viewState.hideInviteAvatars)
|
|
case .knock:
|
|
HomeScreenKnockedCell(room: room, context: context)
|
|
case .room:
|
|
let isSelected = context.viewState.selectedRoomID == room.id
|
|
|
|
HomeScreenRoomCell(room: room,
|
|
roomListActivityVisibility: context.viewState.roomListActivityVisibility,
|
|
isSelected: isSelected,
|
|
mediaProvider: context.mediaProvider,
|
|
action: context.send)
|
|
.simultaneousGesture(TapGesture(count: 2).onEnded {
|
|
context.send(viewAction: .detachRoom(roomIdentifier: room.id))
|
|
})
|
|
.contextMenu {
|
|
if room.badges.isDotShown {
|
|
Button {
|
|
context.send(viewAction: .markRoomAsRead(roomIdentifier: room.id))
|
|
} label: {
|
|
Label(L10n.screenRoomlistMarkAsRead, icon: \.markAsRead)
|
|
}
|
|
} else {
|
|
Button {
|
|
context.send(viewAction: .markRoomAsUnread(roomIdentifier: room.id))
|
|
} label: {
|
|
Label(L10n.screenRoomlistMarkAsUnread, icon: \.markAsUnread)
|
|
}
|
|
}
|
|
|
|
if supportsMultipleWindows {
|
|
Button {
|
|
context.send(viewAction: .detachRoom(roomIdentifier: room.id))
|
|
} label: {
|
|
Label("Open in new window", icon: \.spotlight)
|
|
}
|
|
}
|
|
|
|
if room.isFavourite {
|
|
Button {
|
|
context.send(viewAction: .markRoomAsFavourite(roomIdentifier: room.id, isFavourite: false))
|
|
} label: {
|
|
Label(L10n.commonFavourited, icon: \.favouriteSolid)
|
|
}
|
|
} else {
|
|
Button {
|
|
context.send(viewAction: .markRoomAsFavourite(roomIdentifier: room.id, isFavourite: true))
|
|
} label: {
|
|
Label(L10n.commonFavourite, icon: \.favourite)
|
|
}
|
|
}
|
|
|
|
Button {
|
|
context.send(viewAction: .showRoomDetails(roomIdentifier: room.id))
|
|
} label: {
|
|
Label(L10n.commonSettings, icon: \.settings)
|
|
}
|
|
|
|
if context.viewState.reportRoomEnabled {
|
|
Button(role: .destructive) {
|
|
context.send(viewAction: .reportRoom(roomIdentifier: room.id))
|
|
} label: {
|
|
Label(L10n.actionReportRoom, icon: \.chatProblem)
|
|
}
|
|
}
|
|
|
|
Button(role: .destructive) {
|
|
context.send(viewAction: .leaveRoom(roomIdentifier: room.id))
|
|
} label: {
|
|
Label(L10n.actionLeaveRoom, icon: \.leave)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|