mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 12:07:55 +00:00
22d14ff8e4
* create DependenciesProtocol and replace ServiceLocator registration with it replace mocking calls for ServiceLocator to Dependencies replace ServiceLocator with instance level calls replace ServiceLocator configs with TestDependencies config in Tests replace servicelocator usage in analytics service replace remaining ServiceLocator calls in unit tests that depended on the UnitTestAppCoordinator configuration with per suite dependencies instances fix swiftlint warning remove remaining references to ServiceLocator make dependencies properties consistent in tests delete Dependencies and DependenciesProtocol fix whitespace modifications updates from PR feedback a pass over converting AppSettings and AnalyticsService test instance properties to per test instantiation fix a missed PR feedback Sync up after rebase create DependenciesProtocol and replace ServiceLocator registration with it replace mocking calls for ServiceLocator to Dependencies replace ServiceLocator with instance level calls replace ServiceLocator configs with TestDependencies config in Tests replace servicelocator usage in analytics service replace remaining ServiceLocator calls in unit tests that depended on the UnitTestAppCoordinator configuration with per suite dependencies instances fix swiftlint warning remove remaining references to ServiceLocator make dependencies properties consistent in tests delete Dependencies and DependenciesProtocol * AppSettings is instance level mockable now * replace mocked and preview usages of reset + AppSettings global init with AppSettings(store: UserDefaultsMock()) * AppSettings.UserDefaultsKeys is now a RawRep struct, making it extensible * update tests with new AppSettings so it builds * update remaining AppSettings test/mock inits * AppSettings.UserDefaultsKey conformed to ExpressibleByStringLiteral * addressed issues found in first pass ai review * update AppSettings instantiations after rebase * fix accessibility tests coordinator after rebase * Rename to VolatileUserDefaults * AppSettings init uses mandatory parameter * Revert UserDefaultsKey to enum * Add TrackedUserDefaults to be able to reset the defaults object * Added volatile static func to AppSettings * Use .volatile() static func instead of full init * review fixups * Resolve build issues after rebase * updated enterprise module * remove the static reset settings call from the preview tests --------- Co-authored-by: Mauro Romito <mauro.romito@element.io>
292 lines
12 KiB
Swift
292 lines
12 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 Compound
|
|
import SwiftUI
|
|
|
|
struct HomeScreenRoomCell: View {
|
|
@Environment(\.dynamicTypeSize) var dynamicTypeSize
|
|
@Environment(\.redactionReasons) private var redactionReasons
|
|
|
|
let room: HomeScreenRoom
|
|
var roomListActivityVisibility: RoomListActivityVisibility = .current
|
|
let isSelected: Bool
|
|
let mediaProvider: MediaProviderProtocol!
|
|
let action: (HomeScreenViewAction) -> Void
|
|
|
|
private let verticalInsets = 12.0
|
|
private let horizontalInsets = 16.0
|
|
|
|
var body: some View {
|
|
Button {
|
|
if let roomID = room.roomID {
|
|
action(.selectRoom(roomIdentifier: roomID))
|
|
}
|
|
} label: {
|
|
HStack(spacing: 16.0) {
|
|
avatar
|
|
|
|
content
|
|
.padding(.vertical, verticalInsets)
|
|
.rowDivider(horizontalInsets: horizontalInsets)
|
|
}
|
|
.padding(.horizontal, horizontalInsets)
|
|
.accessibilityElement(children: .combine)
|
|
}
|
|
.buttonStyle(HomeScreenRoomCellButtonStyle(isSelected: isSelected))
|
|
.accessibilityIdentifier(A11yIdentifiers.homeScreen.roomName(room.name))
|
|
.accessibilityHidden(redactionReasons.contains(.placeholder) ? true : false)
|
|
}
|
|
|
|
@ViewBuilder @MainActor
|
|
private var avatar: some View {
|
|
if dynamicTypeSize < .accessibility3 {
|
|
RoomAvatarImage(avatar: room.avatar,
|
|
avatarSize: .room(on: .chats),
|
|
mediaProvider: mediaProvider)
|
|
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
|
|
.accessibilityHidden(true)
|
|
}
|
|
}
|
|
|
|
private var content: some View {
|
|
VStack(alignment: .leading, spacing: 2) {
|
|
header
|
|
footer
|
|
}
|
|
// Hide the normal content for Skeletons and overlay centre aligned placeholders.
|
|
.opacity(redactionReasons.contains(.placeholder) ? 0 : 1)
|
|
.overlay {
|
|
if redactionReasons.contains(.placeholder) {
|
|
VStack(alignment: .leading, spacing: 2) {
|
|
header
|
|
lastMessage
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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)
|
|
|
|
if let timestamp = room.timestamp {
|
|
Text(timestamp)
|
|
.font(room.isHighlighted ? .compound.bodySMSemibold : .compound.bodySM)
|
|
.foregroundColor(room.isHighlighted ? .compound.textActionAccent : .compound.textSecondary)
|
|
}
|
|
}
|
|
}
|
|
|
|
private var headerFont: Font {
|
|
switch roomListActivityVisibility {
|
|
case .current:
|
|
.compound.bodyLGSemibold
|
|
case .show:
|
|
room.hasUnreads ? .compound.bodyLGSemibold : .compound.bodyLG
|
|
case .hide:
|
|
room.isHighlighted ? .compound.bodyLGSemibold : .compound.bodyLG
|
|
}
|
|
}
|
|
|
|
private var footer: some View {
|
|
HStack(alignment: .firstTextBaseline, spacing: 0) {
|
|
ZStack(alignment: .topLeading) {
|
|
// Hidden text with 2 lines to maintain consistent height, scaling with dynamic text.
|
|
Text(" \n ")
|
|
.lastMessageFormatting(hasFailed: false)
|
|
.hidden()
|
|
.environment(\.redactionReasons, []) // Always maintain consistent height
|
|
|
|
HStack(alignment: .top, spacing: 4.0) {
|
|
switch room.lastMessageState {
|
|
case .sending:
|
|
CompoundIcon(\.time, size: .small, relativeTo: .compound.bodyMD)
|
|
.foregroundStyle(.compound.iconTertiary)
|
|
.offset(y: -1)
|
|
.accessibilityLabel(L10n.commonSending)
|
|
case .failed:
|
|
CompoundIcon(\.errorSolid, size: .small, relativeTo: .compound.bodyMD)
|
|
.foregroundStyle(.compound.iconCriticalPrimary)
|
|
.offset(y: -1)
|
|
.accessibilityHidden(true) // The last message contains the error.
|
|
case .none:
|
|
EmptyView()
|
|
}
|
|
|
|
lastMessage
|
|
}
|
|
}
|
|
|
|
Spacer()
|
|
|
|
HStack(spacing: 8) {
|
|
if room.badges.callBadgeType == .voice {
|
|
CompoundIcon(\.voiceCallSolid, size: .xSmall, relativeTo: .compound.bodySM)
|
|
.accessibilityLabel(L10n.a11yNotificationsOngoingCall)
|
|
}
|
|
|
|
if room.badges.callBadgeType == .video {
|
|
CompoundIcon(\.videoCallSolid, size: .xSmall, relativeTo: .compound.bodySM)
|
|
.accessibilityLabel(L10n.a11yNotificationsOngoingCall)
|
|
}
|
|
|
|
if room.badges.isMuteShown {
|
|
CompoundIcon(\.notificationsOffSolid, size: .custom(15), relativeTo: .compound.bodyMD)
|
|
.accessibilityLabel(L10n.a11yNotificationsMuted)
|
|
}
|
|
|
|
if room.badges.isMentionShown {
|
|
mentionIcon
|
|
}
|
|
|
|
if room.badges.isDotShown {
|
|
Circle()
|
|
.frame(width: 12, height: 12)
|
|
.accessibilityLabel(L10n.a11yNotificationsNewMessages)
|
|
}
|
|
}
|
|
.foregroundColor(room.isHighlighted ? .compound.iconAccentTertiary : .compound.iconQuaternary)
|
|
}
|
|
}
|
|
|
|
private var mentionIcon: some View {
|
|
CompoundIcon(\.mention, size: .custom(15), relativeTo: .compound.bodyMD)
|
|
.accessibilityLabel(L10n.a11yNotificationsNewMentions)
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var lastMessage: some View {
|
|
if let displayedLastMessage = room.displayedLastMessage {
|
|
Text(displayedLastMessage)
|
|
.font(lastMessageFont)
|
|
.lastMessageFormatting(hasFailed: room.lastMessageState == .failed)
|
|
}
|
|
}
|
|
|
|
private var lastMessageFont: Font {
|
|
switch roomListActivityVisibility {
|
|
case .current:
|
|
.compound.bodyMD
|
|
case .show:
|
|
room.hasUnreads ? .compound.bodyMDSemibold : .compound.bodyMD
|
|
case .hide:
|
|
room.isHighlighted ? .compound.bodyMDSemibold : .compound.bodyMD
|
|
}
|
|
}
|
|
}
|
|
|
|
struct HomeScreenRoomCellButtonStyle: ButtonStyle {
|
|
let isSelected: Bool
|
|
|
|
func makeBody(configuration: Configuration) -> some View {
|
|
configuration.label
|
|
.background(isSelected ? Color.compound.bgSubtleSecondary : Color.compound.bgCanvasDefault)
|
|
.contentShape(Rectangle())
|
|
.animation(isSelected ? .none : .easeOut(duration: 0.1).disabledDuringTests(), value: isSelected)
|
|
}
|
|
}
|
|
|
|
private extension View {
|
|
func lastMessageFormatting(hasFailed: Bool) -> some View {
|
|
foregroundColor(hasFailed ? .compound.textCriticalPrimary : .compound.textSecondary)
|
|
.lineLimit(2)
|
|
.multilineTextAlignment(.leading)
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
import MatrixRustSDKMocks
|
|
|
|
struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
|
|
static let summaryProviderGeneric = RoomSummaryProviderMock(.init(state: .loaded(.mockRooms)))
|
|
static let genericRooms = summaryProviderGeneric.roomListPublisher.value.compactMap(mockRoom)
|
|
|
|
static let summaryProviderForNotificationsState = RoomSummaryProviderMock(.init(state: .loaded(.mockRoomsWithNotificationsState)))
|
|
static let notificationsStateRooms = summaryProviderForNotificationsState.roomListPublisher.value.compactMap(mockRoom)
|
|
|
|
static let lastMessageStateRooms = [makeRoom(lastMessageState: .sending), makeRoom(lastMessageState: .failed)]
|
|
|
|
static var previews: some View {
|
|
VStack(spacing: 0) {
|
|
ForEach(genericRooms) { room in
|
|
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
|
|
}
|
|
|
|
HomeScreenRoomCell(room: .placeholder(), isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
|
|
.redacted(reason: .placeholder)
|
|
}
|
|
.previewDisplayName("Generic")
|
|
|
|
VStack(spacing: 0) {
|
|
ForEach(notificationsStateRooms) { room in
|
|
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
|
|
}
|
|
}
|
|
.previewLayout(.sizeThatFits)
|
|
.previewDisplayName("Notifications State")
|
|
|
|
VStack(spacing: 0) {
|
|
ForEach(lastMessageStateRooms) { room in
|
|
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
|
|
}
|
|
}
|
|
.previewLayout(.sizeThatFits)
|
|
.previewDisplayName("Last Message State")
|
|
}
|
|
|
|
static func mockRoom(summary: RoomSummary) -> HomeScreenRoom? {
|
|
HomeScreenRoom(summary: summary)
|
|
}
|
|
|
|
static func makeViewModel(roomSummaryProvider: RoomSummaryProviderProtocol) -> HomeScreenViewModel {
|
|
let userSession = UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userID: "John Doe", roomSummaryProvider: roomSummaryProvider))))
|
|
|
|
return HomeScreenViewModel(userSession: userSession,
|
|
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
|
|
appSettings: .volatile(),
|
|
analyticsService: AnalyticsServiceMock.default,
|
|
notificationManager: NotificationManagerMock(),
|
|
userIndicatorController: UserIndicatorControllerMock.default)
|
|
}
|
|
|
|
static func makeRoom(lastMessageState: RoomSummary.LastMessageState) -> HomeScreenRoom {
|
|
let summary = RoomSummary(room: RoomSDKMock(),
|
|
id: UUID().uuidString,
|
|
joinRequestType: nil,
|
|
name: "Foundation and Empire",
|
|
isDirect: false,
|
|
isSpace: false,
|
|
avatarURL: .mockMXCAvatar,
|
|
heroes: [],
|
|
activeMembersCount: 0,
|
|
lastMessage: AttributedString("How do you see the Emperor then? You think he keeps office hours?"),
|
|
lastMessageDate: .mock,
|
|
lastMessageState: lastMessageState,
|
|
unreadMessagesCount: 2,
|
|
unreadMentionsCount: 0,
|
|
unreadNotificationsCount: 2,
|
|
notificationMode: .mute,
|
|
canonicalAlias: "#foundation-and-empire:matrix.org",
|
|
alternativeAliases: [],
|
|
hasOngoingCall: false,
|
|
activeCallIntent: nil,
|
|
isMarkedUnread: false,
|
|
isFavourite: false,
|
|
isTombstoned: false)
|
|
|
|
return .init(summary: summary)
|
|
}
|
|
}
|