mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
a520d94760
* Enable Swift 6.2 with default main actor isolation for the app target Turn on SWIFT_VERSION 6.2, SWIFT_APPROACHABLE_CONCURRENCY and SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor for the ElementX target, matching the NSE and Share Extension (which already use 6.2 without the main actor default). # Conflicts: # ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update the code generation templates for Swift 6 Emit nonisolated/@unchecked Sendable mocks and nonisolated string enums, and mark async mock methods @concurrent so they keep suspending like the real implementations (otherwise intermediate states are unobservable in tests). Includes the regenerated mocks and strings. # Conflicts: # ElementX/Sources/Mocks/Generated/GeneratedMocks.swift * Make the data layer and services nonisolated and Sendable Annotate the value-type models, Rust SDK proxy wrappers, timeline item graph, settings, logging and NSE-shared types as nonisolated, and conform the service protocols to Sendable so their existentials can cross isolation boundaries. These types run off the main actor and no longer inherit the target's default main actor isolation. * Adopt the new isolation across call sites, mocks and signatures Update call sites, closure signatures and mock configuration helpers to match the nonisolated/Sendable data layer, including the main actor isolated mock inits and the @Sendable filter on recentlyVisitedRooms. ^ Conflicts: ^ ElementX/Sources/Services/SecureBackup/SecureBackupController.swift * Remove redundant @MainActor annotations With the app target defaulting to main actor isolation, the explicit @MainActor on view models, coordinators, views and their protocols is no longer required. * Fix concurrency hotspots surfaced by the migration Resolve the room summary main-thread deadlock by moving diff processing onto AsyncStreams, add the SDKListener.onMainActor FIFO bridge for SDK callbacks, hop KVO/timer/UIKit callbacks to the main actor via assumeIsolated, add isolated deinits, and apply the few justified nonisolated(unsafe) escapes for queue-confined Apple APIs. * Fix the unit tests for Swift 6 concurrency Hop the waitForConfirmation body onto the caller's actor (Swift Testing runs confirmation closures off-actor), and adjust the affected suites and async signatures. * offload diffs on concurrent threads instead of main actor * make room info protocols sendable * use a task group for fetching data so that everything runs concurrently in the TextRoomTimelineView when getting the preview. * use the generic onMainActor implementation, which already makes a stream and send the continuation on the main actor. * small pr comments issues being addressed * update enterprise * Update StaticCode to 1.1.0 and specify the required Swift isolation. * fix ElementCallServiceTests * update enterprise * re-generate mocks * update enterprise * enterprise new code conformed to swift 6 --------- Co-authored-by: Doug <douglase@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
|
|
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(summary: $0) }
|
|
|
|
static let summaryProviderForNotificationsState = RoomSummaryProviderMock(.init(state: .loaded(.mockRoomsWithNotificationsState)))
|
|
static let notificationsStateRooms = summaryProviderForNotificationsState.roomListPublisher.value.compactMap { mockRoom(summary: $0) }
|
|
|
|
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(.init())) { _ in }
|
|
}
|
|
|
|
HomeScreenRoomCell(room: .placeholder(), isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
|
|
.redacted(reason: .placeholder)
|
|
}
|
|
.previewDisplayName("Generic")
|
|
|
|
VStack(spacing: 0) {
|
|
ForEach(notificationsStateRooms) { room in
|
|
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
|
|
}
|
|
}
|
|
.previewLayout(.sizeThatFits)
|
|
.previewDisplayName("Notifications State")
|
|
|
|
VStack(spacing: 0) {
|
|
ForEach(lastMessageStateRooms) { room in
|
|
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(.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(.init()),
|
|
notificationManager: NotificationManagerMock(),
|
|
userIndicatorController: UserIndicatorControllerMock())
|
|
}
|
|
|
|
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)
|
|
}
|
|
}
|