* session verification now does not have a waiting screen, but the initial state instead presents a loading state. Everything is also handled with one single action * use progress view in place of the spinner icon * change progress view tint
299 lines
13 KiB
Swift
299 lines
13 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 MatrixRustSDK
|
|
import SwiftUI
|
|
|
|
struct SessionVerificationScreen: View {
|
|
enum AccessibilityFocus {
|
|
case title
|
|
}
|
|
|
|
@ObservedObject var context: SessionVerificationScreenViewModel.Context
|
|
@AccessibilityFocusState private var accessibilityFocus: AccessibilityFocus?
|
|
|
|
var body: some View {
|
|
FullscreenDialog {
|
|
VStack(spacing: 32) {
|
|
screenHeader
|
|
mainContent
|
|
}
|
|
} bottomContent: {
|
|
actionButtons
|
|
}
|
|
.background()
|
|
.backgroundStyle(.compound.bgCanvasDefault)
|
|
.interactiveDismissDisabled()
|
|
.navigationBarBackButtonHidden(context.viewState.verificationState == .verified)
|
|
.toolbar { toolbar }
|
|
.onAppear {
|
|
var announcement = AttributedString(L10n.a11ySessionVerificationTimeLimitedActionRequired)
|
|
announcement.accessibilitySpeechAnnouncementPriority = .high
|
|
AccessibilityNotification.Announcement(announcement).post()
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private var toolbar: some ToolbarContent {
|
|
ToolbarItem(placement: .cancellationAction) {
|
|
switch context.viewState.flow {
|
|
case .userInitiator, .userResponder:
|
|
Button(L10n.actionCancel) {
|
|
context.send(viewAction: .cancel)
|
|
}
|
|
default:
|
|
EmptyView()
|
|
}
|
|
}
|
|
}
|
|
|
|
private var screenHeader: some View {
|
|
VStack(spacing: 0) {
|
|
BigIcon(icon: context.viewState.headerIcon.keyPath,
|
|
style: context.viewState.headerIcon.style)
|
|
.padding(.bottom, 16)
|
|
|
|
Text(context.viewState.title ?? "")
|
|
.font(.compound.headingMDBold)
|
|
.multilineTextAlignment(.center)
|
|
.foregroundColor(.compound.textPrimary)
|
|
.padding(.bottom, 8)
|
|
.accessibilityIdentifier(context.viewState.titleAccessibilityIdentifier)
|
|
.onChange(of: context.viewState.title) { _, _ in
|
|
accessibilityFocus = .title
|
|
}
|
|
.accessibilityFocused($accessibilityFocus, equals: .title)
|
|
|
|
Text(context.viewState.message)
|
|
.font(.compound.bodyMD)
|
|
.multilineTextAlignment(.center)
|
|
.foregroundColor(.compound.textSecondary)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var mainContent: some View {
|
|
switch context.viewState.verificationState {
|
|
case .initial, .acceptingVerificationRequest, .requestingVerification, .verificationRequestAccepted, .startingSasVerification, .sasVerificationStarted:
|
|
switch context.viewState.flow {
|
|
case .deviceResponder(let details):
|
|
SessionVerificationRequestDetailsView(details: details,
|
|
isUserVerification: false,
|
|
mediaProvider: context.mediaProvider)
|
|
case .userResponder(let details):
|
|
SessionVerificationRequestDetailsView(details: details,
|
|
isUserVerification: true,
|
|
mediaProvider: context.mediaProvider)
|
|
case .userInitiator:
|
|
Button(L10n.actionLearnMore) {
|
|
UIApplication.shared.open(context.viewState.learnMoreURL)
|
|
}
|
|
.buttonStyle(.compound(.tertiary, size: .small))
|
|
default:
|
|
EmptyView()
|
|
}
|
|
|
|
case .showingChallenge(let emojis), .acceptingChallenge(let emojis), .decliningChallenge(let emojis):
|
|
emojisPanel(with: emojis)
|
|
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.emojiWrapper)
|
|
default:
|
|
EmptyView()
|
|
}
|
|
}
|
|
|
|
private func emojisPanel(with emojis: [SessionVerificationEmoji]) -> some View {
|
|
VStack(spacing: 32) {
|
|
HStack(spacing: 16) {
|
|
ForEach(emojis.prefix(4), id: \.self) { emoji in
|
|
EmojiView(emoji: emoji)
|
|
}
|
|
}
|
|
HStack(spacing: 16) {
|
|
ForEach(emojis.suffix(from: 4), id: \.self) { emoji in
|
|
EmojiView(emoji: emoji)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var actionButtons: some View {
|
|
switch context.viewState.verificationState {
|
|
case .initial, .acceptingVerificationRequest, .requestingVerification,
|
|
.verificationRequestAccepted, .startingSasVerification, .sasVerificationStarted, .cancelling:
|
|
VStack(spacing: 16) {
|
|
startVerificationButton
|
|
|
|
if context.viewState.showIgnoreButton {
|
|
Button(L10n.actionIgnore) {
|
|
context.send(viewAction: .ignoreVerificationRequest)
|
|
}
|
|
.buttonStyle(.compound(.tertiary))
|
|
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.ignoreVerificationRequest)
|
|
.disabled(context.viewState.isWaiting)
|
|
}
|
|
}
|
|
case .cancelled:
|
|
switch context.viewState.flow {
|
|
case .deviceInitiator, .userInitiator:
|
|
Button(L10n.actionRetry) {
|
|
context.send(viewAction: .restart)
|
|
}
|
|
.buttonStyle(.compound(.primary))
|
|
case .deviceResponder, .userResponder:
|
|
Button(L10n.actionDone) {
|
|
context.send(viewAction: .done)
|
|
}
|
|
.buttonStyle(.compound(.primary))
|
|
}
|
|
|
|
case .showingChallenge:
|
|
VStack(spacing: 16) {
|
|
Button(L10n.screenSessionVerificationTheyMatch) {
|
|
context.send(viewAction: .accept)
|
|
}
|
|
.buttonStyle(.compound(.primary))
|
|
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.acceptChallenge)
|
|
|
|
Button(L10n.screenSessionVerificationTheyDontMatch) {
|
|
context.send(viewAction: .decline)
|
|
}
|
|
.buttonStyle(.compound(.tertiary))
|
|
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.declineChallenge)
|
|
}
|
|
|
|
default:
|
|
EmptyView()
|
|
}
|
|
}
|
|
|
|
private var startVerificationButton: some View {
|
|
Button {
|
|
switch context.viewState.flow {
|
|
case .deviceInitiator, .userInitiator:
|
|
context.send(viewAction: .requestVerification)
|
|
case .deviceResponder, .userResponder:
|
|
context.send(viewAction: .acceptVerificationRequest)
|
|
}
|
|
} label: {
|
|
Label {
|
|
Text(L10n.actionStartVerification)
|
|
} icon: {
|
|
if context.viewState.isWaiting {
|
|
ProgressView()
|
|
.tint(.compound.iconOnSolidPrimary)
|
|
}
|
|
}
|
|
}
|
|
.buttonStyle(.compound(.primary))
|
|
.disabled(context.viewState.isWaiting)
|
|
.accessibilityIdentifier(startVerificationButtonAccessibilityIdentifier)
|
|
}
|
|
|
|
private var startVerificationButtonAccessibilityIdentifier: String {
|
|
switch context.viewState.flow {
|
|
case .deviceInitiator, .userInitiator:
|
|
A11yIdentifiers.sessionVerificationScreen.requestVerification
|
|
case .deviceResponder, .userResponder:
|
|
A11yIdentifiers.sessionVerificationScreen.acceptVerificationRequest
|
|
}
|
|
}
|
|
|
|
struct EmojiView: View {
|
|
let emoji: SessionVerificationEmoji
|
|
|
|
var body: some View {
|
|
VStack(spacing: 16.0) {
|
|
Text(emoji.symbol)
|
|
.font(.compound.headingXLBold)
|
|
.accessibilityHidden(true)
|
|
Text(emoji.localizedDescription.capitalized)
|
|
.font(.compound.bodyMD)
|
|
.foregroundColor(.compound.textSecondary)
|
|
}
|
|
.accessibilityElement(children: .combine)
|
|
.padding(8.0)
|
|
}
|
|
}
|
|
}
|
|
|
|
struct SessionVerification_Previews: PreviewProvider, TestablePreview {
|
|
static var previews: some View {
|
|
sessionVerificationScreen(state: .initial, flow: .deviceInitiator)
|
|
.previewDisplayName("Initial - Device Initiator")
|
|
|
|
sessionVerificationScreen(state: .initial, flow: .userInitiator(userID: "@bob:matrix.org"))
|
|
.previewDisplayName("Initial - User Initiator")
|
|
|
|
let details = SessionVerificationRequestDetails(senderProfile: UserProfileProxy(userID: "@bob:matrix.org",
|
|
displayName: "Billy Bob",
|
|
avatarURL: .mockMXCUserAvatar),
|
|
flowID: "123",
|
|
deviceID: "CODEMISTAKE",
|
|
deviceDisplayName: "Bob's Element X iOS",
|
|
firstSeenDate: .init(timeIntervalSince1970: 0))
|
|
|
|
sessionVerificationScreen(state: .initial,
|
|
flow: .deviceResponder(requestDetails: details))
|
|
.previewDisplayName("Initial - Device Responder")
|
|
|
|
sessionVerificationScreen(state: .initial,
|
|
flow: .userResponder(requestDetails: details))
|
|
.previewDisplayName("Initial - User Responder")
|
|
|
|
sessionVerificationScreen(state: .acceptingVerificationRequest,
|
|
flow: .deviceResponder(requestDetails: details))
|
|
.previewDisplayName("Accepting Verification Request - Device Responder")
|
|
|
|
sessionVerificationScreen(state: .requestingVerification,
|
|
flow: .deviceInitiator)
|
|
.previewDisplayName("Requesting Verification - Device Initiator")
|
|
|
|
sessionVerificationScreen(state: .verificationRequestAccepted,
|
|
flow: .userInitiator(userID: "@bob:matrix.org"))
|
|
.previewDisplayName("Request Accepted - User Initiator")
|
|
|
|
sessionVerificationScreen(state: .startingSasVerification,
|
|
flow: .userResponder(requestDetails: details))
|
|
.previewDisplayName("Starting SAS Verification - User Responder")
|
|
|
|
sessionVerificationScreen(state: .sasVerificationStarted,
|
|
flow: .deviceResponder(requestDetails: details))
|
|
.previewDisplayName("SAS Verification started - Device Responder")
|
|
|
|
sessionVerificationScreen(state: .showingChallenge(emojis: SessionVerificationControllerProxyMock.emojis))
|
|
.previewDisplayName("Showing Challenge")
|
|
sessionVerificationScreen(state: .acceptingChallenge(emojis: SessionVerificationControllerProxyMock.emojis))
|
|
.previewDisplayName("Accepting Challenge")
|
|
sessionVerificationScreen(state: .decliningChallenge(emojis: SessionVerificationControllerProxyMock.emojis))
|
|
.previewDisplayName("Declining Challenge")
|
|
|
|
sessionVerificationScreen(state: .verified)
|
|
.previewDisplayName("Verified")
|
|
|
|
sessionVerificationScreen(state: .cancelling, flow: .deviceInitiator)
|
|
.previewDisplayName("Cancelling - Device Initiator")
|
|
|
|
sessionVerificationScreen(state: .cancelled)
|
|
.previewDisplayName("Cancelled")
|
|
}
|
|
|
|
static func sessionVerificationScreen(state: SessionVerificationScreenStateMachine.State,
|
|
flow: SessionVerificationScreenFlow = .deviceInitiator) -> some View {
|
|
let viewModel = SessionVerificationScreenViewModel(sessionVerificationControllerProxy: SessionVerificationControllerProxyMock.configureMock(),
|
|
flow: flow,
|
|
appSettings: AppSettings(),
|
|
mediaProvider: MediaProviderMock(configuration: .init()),
|
|
verificationState: state)
|
|
|
|
return SessionVerificationScreen(context: viewModel.context)
|
|
}
|
|
}
|