mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 12:07:55 +00:00
Mauro
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>
514 lines
20 KiB
Swift
514 lines
20 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 Compound
|
|
import SwiftUI
|
|
|
|
struct JoinRoomScreen: View {
|
|
private let maxKnockMessageLength = 500
|
|
@Environment(\.dynamicTypeSize) private var dynamicTypeSize
|
|
|
|
@ObservedObject var context: JoinRoomScreenViewModel.Context
|
|
@FocusState private var focus: Focus?
|
|
|
|
private enum Focus {
|
|
case knockMessage
|
|
}
|
|
|
|
private var topPadding: CGFloat {
|
|
if context.viewState.roomDetails?.inviter != nil {
|
|
return 32
|
|
}
|
|
return context.viewState.mode == .knocked ? 151 : 32
|
|
}
|
|
|
|
var body: some View {
|
|
FullscreenDialog(topPadding: topPadding) {
|
|
if context.viewState.mode == .loading {
|
|
EmptyView()
|
|
} else {
|
|
mainContent
|
|
}
|
|
} bottomContent: {
|
|
bottomContent
|
|
}
|
|
.alert(item: $context.alertInfo)
|
|
.background()
|
|
.backgroundStyle(.compound.bgCanvasDefault)
|
|
.toolbarRole(RoomHeaderView.toolbarRole)
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
.toolbar { toolbar }
|
|
.shouldScrollOnKeyboardDidShow(focus == .knockMessage, to: Focus.knockMessage)
|
|
}
|
|
|
|
@ViewBuilder
|
|
var mainContent: some View {
|
|
switch context.viewState.mode {
|
|
case .knocked:
|
|
knockedView
|
|
default:
|
|
defaultView
|
|
}
|
|
}
|
|
|
|
private var defaultView: some View {
|
|
VStack(spacing: 16) {
|
|
RoomAvatarImage(avatar: context.viewState.avatar ?? .room(id: "", name: nil, avatarURL: nil),
|
|
avatarSize: .room(on: .joinRoom),
|
|
mediaProvider: context.mediaProvider)
|
|
.dynamicTypeSize(dynamicTypeSize < .accessibility1 ? dynamicTypeSize : .accessibility1)
|
|
.opacity(context.viewState.avatar == nil ? 0 : 1)
|
|
.accessibilityHidden(true)
|
|
|
|
VStack(spacing: 8) {
|
|
Text(context.viewState.title)
|
|
.font(.compound.headingLGBold)
|
|
.foregroundStyle(.compound.textPrimary)
|
|
.multilineTextAlignment(.center)
|
|
|
|
if let subtitle = context.viewState.subtitle {
|
|
Label {
|
|
Text(subtitle)
|
|
.font(.compound.bodyLG)
|
|
.foregroundStyle(.compound.textSecondary)
|
|
.multilineTextAlignment(.center)
|
|
} icon: {
|
|
if let icon = context.viewState.subtitleIcon {
|
|
CompoundIcon(icon, size: .small, relativeTo: .compound.bodyLG)
|
|
.foregroundStyle(.compound.iconTertiary)
|
|
}
|
|
}
|
|
}
|
|
|
|
if !context.viewState.isDMInvite, let memberCount = context.viewState.roomDetails?.memberCount {
|
|
JoinedMembersBadgeView(heroes: context.viewState.roomDetails?.heroes ?? [],
|
|
shouldHideAvatars: context.viewState.shouldHideAvatars,
|
|
joinedCount: memberCount,
|
|
mediaProvider: context.mediaProvider)
|
|
}
|
|
}
|
|
|
|
if let topic = context.viewState.roomDetails?.topic {
|
|
Text(topic)
|
|
.font(.compound.bodyMD)
|
|
.foregroundStyle(.compound.textPrimary)
|
|
.multilineTextAlignment(.center)
|
|
.lineLimit(2)
|
|
}
|
|
|
|
if let inviter = context.viewState.roomDetails?.inviter {
|
|
InviterView(inviter: inviter,
|
|
shouldHideAvatar: context.viewState.shouldHideAvatars,
|
|
mediaProvider: context.mediaProvider)
|
|
.padding(.top, 16)
|
|
}
|
|
|
|
if context.viewState.mode == .knockable {
|
|
knockMessage
|
|
.padding(.top, 19)
|
|
}
|
|
}
|
|
}
|
|
|
|
private var knockedView: some View {
|
|
VStack(spacing: 16) {
|
|
BigIcon(icon: \.checkCircleSolid, style: .successSolid)
|
|
VStack(spacing: 8) {
|
|
Text(L10n.screenJoinRoomKnockSentTitle)
|
|
.font(.compound.headingMDBold)
|
|
.foregroundStyle(.compound.textPrimary)
|
|
.multilineTextAlignment(.center)
|
|
Text(L10n.screenJoinRoomKnockSentDescription)
|
|
.font(.compound.bodyMD)
|
|
.foregroundStyle(.compound.textSecondary)
|
|
.multilineTextAlignment(.center)
|
|
}
|
|
}
|
|
}
|
|
|
|
private var knockMessage: some View {
|
|
VStack(alignment: .leading, spacing: 12) {
|
|
HStack(spacing: 0) {
|
|
TextField(L10n.screenJoinRoomKnockMessageDescription, text: $context.knockMessage, axis: .vertical)
|
|
.focused($focus, equals: .knockMessage)
|
|
.onChange(of: context.knockMessage) { _, newValue in
|
|
context.knockMessage = String(newValue.prefix(maxKnockMessageLength))
|
|
}
|
|
.lineLimit(4, reservesSpace: true)
|
|
.font(.compound.bodyMD)
|
|
.padding(.horizontal, 16)
|
|
.padding(.vertical, 12)
|
|
.id(Focus.knockMessage)
|
|
.accessibilityHint(L10n.screenJoinRoomKnockMessageCharactersCount(context.knockMessage.count, maxKnockMessageLength))
|
|
}
|
|
.background(.compound.bgCanvasDefault)
|
|
.cornerRadius(8)
|
|
.overlay {
|
|
RoundedRectangle(cornerRadius: 8)
|
|
.inset(by: 0.5)
|
|
.stroke(.compound.borderInteractivePrimary)
|
|
.accessibilityHidden(true)
|
|
}
|
|
|
|
Text("\(context.knockMessage.count)/\(maxKnockMessageLength)")
|
|
.font(.compound.bodySM)
|
|
.foregroundStyle(.compound.textSecondary)
|
|
// We will have a hint for this in voice over mode
|
|
.accessibilityHidden(true)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
var bottomContent: some View {
|
|
switch context.viewState.mode {
|
|
case .loading:
|
|
EmptyView()
|
|
case .joinable:
|
|
joinButton
|
|
case .unknown, .restricted: // If unknown, do our best.
|
|
VStack(spacing: 24) {
|
|
bottomNoticeMessage(L10n.screenJoinRoomJoinRestrictedMessage)
|
|
|
|
joinButton
|
|
}
|
|
case .knockable:
|
|
Button(L10n.screenJoinRoomKnockAction) { context.send(viewAction: .knock) }
|
|
.buttonStyle(.compound(.super))
|
|
case .knocked:
|
|
Button(L10n.screenJoinRoomCancelKnockAction) { context.send(viewAction: .cancelKnock) }
|
|
.buttonStyle(.compound(.secondary))
|
|
case .inviteRequired:
|
|
bottomNoticeMessage(L10n.screenJoinRoomInviteRequiredMessage)
|
|
case .invited:
|
|
ViewThatFits {
|
|
VStack(spacing: 24) {
|
|
HStack(spacing: 16) {
|
|
inviteButtons
|
|
}
|
|
declineAndBlockButton
|
|
}
|
|
|
|
VStack(spacing: 16) {
|
|
inviteButtons
|
|
declineAndBlockButton
|
|
}
|
|
}
|
|
case .banned(let sender, let reason):
|
|
VStack(spacing: 24) {
|
|
if let sender, let reason {
|
|
bottomErrorMessage(title: L10n.screenJoinRoomBanByMessage(sender),
|
|
subtitle: L10n.screenJoinRoomBanReason(reason))
|
|
} else {
|
|
bottomErrorMessage(title: L10n.screenJoinRoomBanMessage, subtitle: nil)
|
|
}
|
|
|
|
Button(L10n.screenJoinRoomForgetAction) {
|
|
context.send(viewAction: .forget)
|
|
}
|
|
.buttonStyle(.compound(.primary))
|
|
}
|
|
case .forbidden:
|
|
forbiddenView
|
|
}
|
|
}
|
|
|
|
private var forbiddenView: some View {
|
|
VStack(spacing: 24) {
|
|
bottomErrorMessage(title: L10n.screenJoinRoomFailMessage, subtitle: L10n.screenJoinRoomFailReason)
|
|
Button(L10n.actionOk) {
|
|
context.send(viewAction: .dismiss)
|
|
}
|
|
.buttonStyle(.compound(.primary))
|
|
}
|
|
}
|
|
|
|
func bottomNoticeMessage(_ notice: String) -> some View {
|
|
Label(notice, icon: \.info)
|
|
.labelStyle(.custom(spacing: 12, alignment: .top))
|
|
.font(.compound.bodyLGSemibold)
|
|
.foregroundStyle(.compound.textPrimary)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.padding()
|
|
.background(.compound.bgSubtleSecondary)
|
|
.cornerRadius(14, corners: .allCorners)
|
|
}
|
|
|
|
func bottomErrorMessage(title: String, subtitle: String?) -> some View {
|
|
Label {
|
|
VStack(alignment: .leading, spacing: 4) {
|
|
Text(title)
|
|
.font(.compound.bodyLGSemibold)
|
|
.foregroundStyle(.compound.textCriticalPrimary)
|
|
|
|
if let subtitle {
|
|
Text(subtitle)
|
|
.font(.compound.bodyMD)
|
|
.foregroundStyle(.compound.textSecondary)
|
|
}
|
|
}
|
|
} icon: {
|
|
CompoundIcon(\.errorSolid)
|
|
.foregroundStyle(.compound.iconCriticalPrimary)
|
|
}
|
|
.labelStyle(.custom(spacing: 12, alignment: .top))
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.padding()
|
|
.background(.compound.bgSubtleSecondary)
|
|
.cornerRadius(14, corners: .allCorners)
|
|
}
|
|
|
|
@ViewBuilder
|
|
var inviteButtons: some View {
|
|
Button(L10n.actionDecline) { context.send(viewAction: .declineInvite) }
|
|
.buttonStyle(.compound(.secondary))
|
|
Button(L10n.actionAccept) { context.send(viewAction: .acceptInvite) }
|
|
.buttonStyle(.compound(.primary))
|
|
}
|
|
|
|
@ViewBuilder
|
|
var declineAndBlockButton: some View {
|
|
if let inviter = context.viewState.roomDetails?.inviter {
|
|
Button(L10n.screenJoinRoomDeclineAndBlockButtonTitle, role: .destructive) {
|
|
context.send(viewAction: .declineInviteAndBlock(userID: inviter.id))
|
|
}
|
|
.buttonStyle(.compound(.tertiary))
|
|
}
|
|
}
|
|
|
|
var joinButton: some View {
|
|
Button(L10n.screenJoinRoomJoinAction) { context.send(viewAction: .join) }
|
|
.buttonStyle(.compound(.super))
|
|
.accessibilityIdentifier(A11yIdentifiers.joinRoomScreen.join)
|
|
}
|
|
|
|
@ToolbarContentBuilder
|
|
private var toolbar: some ToolbarContent {
|
|
if context.viewState.mode == .knocked {
|
|
ToolbarItem(placement: .principal) {
|
|
if let avatar = context.viewState.avatar {
|
|
RoomHeaderView(roomName: context.viewState.title,
|
|
roomAvatar: avatar,
|
|
mediaProvider: context.mediaProvider) {
|
|
// There is no action but the iOS 26 designs have it looking like a button.
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private struct InviterView: View {
|
|
let inviter: RoomInviterDetails
|
|
let shouldHideAvatar: Bool
|
|
|
|
let mediaProvider: MediaProviderProtocol?
|
|
|
|
var body: some View {
|
|
VStack(spacing: 8) {
|
|
Text(L10n.screenJoinRoomInvitedBy)
|
|
.font(.compound.bodyMD)
|
|
.foregroundStyle(.compound.textPrimary)
|
|
.multilineTextAlignment(.center)
|
|
|
|
LoadableAvatarImage(url: shouldHideAvatar ? nil : inviter.avatarURL,
|
|
name: inviter.displayName,
|
|
contentID: inviter.id,
|
|
avatarSize: .custom(52),
|
|
mediaProvider: mediaProvider)
|
|
.accessibilityHidden(true)
|
|
|
|
VStack(spacing: 4) {
|
|
if let displayName = inviter.displayName {
|
|
Text(displayName)
|
|
.font(.compound.bodyLGSemibold)
|
|
.foregroundStyle(.compound.textPrimary)
|
|
.multilineTextAlignment(.center)
|
|
}
|
|
|
|
Text(inviter.id)
|
|
.font(.compound.bodySM)
|
|
.foregroundStyle(.compound.textSecondary)
|
|
.multilineTextAlignment(.center)
|
|
}
|
|
}
|
|
.accessibilityElement(children: .combine)
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
struct JoinRoomScreen_Previews: PreviewProvider, TestablePreview {
|
|
static let previewWrappers: [JoinRoomScreenPreviewWrapper] = [
|
|
.init(mode: .unknown),
|
|
.init(mode: .joinable),
|
|
.init(mode: .restricted, canJoinRoom: false),
|
|
.init(mode: .restricted, customPreviewName: "RestrictedJoinable"),
|
|
.init(mode: .inviteRequired),
|
|
.init(mode: .invited(isDM: false)),
|
|
.init(mode: .invited(isDM: true)),
|
|
.init(mode: .invited(isDM: false), hideInviteAvatars: true, customPreviewName: "InvitedWithHiddenAvatars"),
|
|
.init(mode: .knockable),
|
|
.init(mode: .knocked),
|
|
.init(mode: .banned(sender: "Bob", reason: "Spamming")),
|
|
.init(mode: .forbidden)
|
|
]
|
|
|
|
static var previews: some View {
|
|
ForEach(previewWrappers) { wrapper in
|
|
wrapper.preview
|
|
}
|
|
}
|
|
}
|
|
|
|
struct JoinRoomScreenSpace_Previews: PreviewProvider, TestablePreview {
|
|
static let previewWrappers: [JoinRoomScreenPreviewWrapper] = [
|
|
.init(isSpace: true, mode: .joinable),
|
|
.init(isSpace: true, mode: .restricted, canJoinRoom: false),
|
|
.init(isSpace: true, mode: .restricted, customPreviewName: "RestrictedJoinable"),
|
|
.init(isSpace: true, mode: .inviteRequired),
|
|
.init(isSpace: true, mode: .invited(isDM: false)),
|
|
.init(isSpace: true, mode: .invited(isDM: false), hideInviteAvatars: true, customPreviewName: "InvitedWithHiddenAvatars"),
|
|
.init(isSpace: true, mode: .knockable),
|
|
.init(isSpace: true, mode: .knocked),
|
|
.init(isSpace: true, mode: .banned(sender: "Bob", reason: "Spamming")),
|
|
.init(isSpace: true, mode: .forbidden)
|
|
]
|
|
|
|
static var previews: some View {
|
|
ForEach(previewWrappers) { wrapper in
|
|
wrapper.preview
|
|
}
|
|
}
|
|
}
|
|
|
|
struct JoinRoomScreenPreviewWrapper: Identifiable {
|
|
let id = UUID()
|
|
let viewModel: JoinRoomScreenViewModel
|
|
let mode: JoinRoomScreenMode
|
|
let isSpace: Bool
|
|
let customPreviewName: String?
|
|
|
|
init(isSpace: Bool = false,
|
|
mode: JoinRoomScreenMode,
|
|
canJoinRoom: Bool = true,
|
|
hideInviteAvatars: Bool = false,
|
|
customPreviewName: String? = nil) {
|
|
self.mode = mode
|
|
self.isSpace = isSpace
|
|
self.customPreviewName = customPreviewName
|
|
|
|
let appSettings = AppSettings.volatile()
|
|
|
|
let clientProxy = ClientProxyMock(.init(hideInviteAvatars: hideInviteAvatars))
|
|
clientProxy.canJoinRoomWithReturnValue = canJoinRoom
|
|
|
|
switch mode {
|
|
case .unknown:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .failure(.roomPreviewIsPrivate)
|
|
clientProxy.roomForIdentifierReturnValue = nil
|
|
case .joinable:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(RoomPreviewProxyMock.joinable)
|
|
clientProxy.roomForIdentifierReturnValue = nil
|
|
case .restricted:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(RoomPreviewProxyMock.restricted)
|
|
clientProxy.roomForIdentifierReturnValue = nil
|
|
case .inviteRequired:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(RoomPreviewProxyMock.inviteRequired)
|
|
clientProxy.roomForIdentifierReturnValue = nil
|
|
case .invited(let isDM):
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(isDM ? RoomPreviewProxyMock.inviteDM() : .invited())
|
|
clientProxy.roomForIdentifierClosure = { _ in
|
|
.invited(InvitedRoomProxyMock(.init(avatarURL: .mockMXCAvatar, inviter: .mockDan)))
|
|
}
|
|
case .knockable:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(RoomPreviewProxyMock.knockable)
|
|
clientProxy.roomForIdentifierReturnValue = nil
|
|
case .knocked:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(RoomPreviewProxyMock.knocked)
|
|
clientProxy.roomForIdentifierClosure = { _ in
|
|
.knocked(KnockedRoomProxyMock(.init(avatarURL: .mockMXCAvatar)))
|
|
}
|
|
case .banned:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(RoomPreviewProxyMock.banned)
|
|
clientProxy.roomForIdentifierClosure = { _ in
|
|
.banned(BannedRoomProxyMock(.init(avatarURL: .mockMXCAvatar)))
|
|
}
|
|
case .forbidden:
|
|
clientProxy.roomPreviewForIdentifierViaReturnValue = .success(RoomPreviewProxyMock.restricted)
|
|
clientProxy.roomForIdentifierReturnValue = nil
|
|
clientProxy.joinRoomAliasClosure = { _ in
|
|
.failure(.forbiddenAccess)
|
|
}
|
|
default:
|
|
break
|
|
}
|
|
|
|
let source: JoinRoomScreenSource = if isSpace {
|
|
.space(SpaceServiceRoom.mock(joinRoomScreenMode: mode))
|
|
} else {
|
|
.generic(roomID: "1", via: [])
|
|
}
|
|
|
|
viewModel = JoinRoomScreenViewModel(source: source,
|
|
appSettings: appSettings,
|
|
userSession: UserSessionMock(.init(clientProxy: clientProxy)),
|
|
userIndicatorController: UserIndicatorControllerMock())
|
|
}
|
|
|
|
var previewDisplayName: String {
|
|
switch mode {
|
|
case .unknown:
|
|
return "Unknown"
|
|
case .loading:
|
|
return "Loading"
|
|
case .joinable:
|
|
return "Joinable"
|
|
case .restricted:
|
|
return "Restricted"
|
|
case .inviteRequired:
|
|
return "InviteRequired"
|
|
case .invited(isDM: let isDM):
|
|
return isDM ? "InvitedDM" : "Invited"
|
|
case .knockable:
|
|
return "Knockable"
|
|
case .knocked:
|
|
return "Knocked"
|
|
case .banned:
|
|
return "Banned"
|
|
case .forbidden:
|
|
return "Forbidden"
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
var preview: some View {
|
|
let previewDisplayName = customPreviewName ?? previewDisplayName
|
|
let previewDisplayNameSuffix = isSpace ? " Space" : ""
|
|
if mode == .forbidden {
|
|
ElementNavigationStack {
|
|
JoinRoomScreen(context: viewModel.context)
|
|
}
|
|
.snapshotPreferences(expect: viewModel.context.$viewState.map { state in
|
|
state.mode == .forbidden
|
|
})
|
|
.onAppear {
|
|
viewModel.context.send(viewAction: .join)
|
|
}
|
|
.previewDisplayName(previewDisplayName + previewDisplayNameSuffix)
|
|
} else {
|
|
ElementNavigationStack {
|
|
JoinRoomScreen(context: viewModel.context)
|
|
}
|
|
.snapshotPreferences(expect: viewModel.context.$viewState.map { state in
|
|
state.roomDetails != nil
|
|
})
|
|
.previewDisplayName(previewDisplayName + previewDisplayNameSuffix)
|
|
}
|
|
}
|
|
}
|