mirror of
https://github.com/element-hq/element-x-ios.git
synced 2025-03-10 21:39:12 +00:00
Tweak the session verification icons and copy.
This commit is contained in:
parent
814eff28dd
commit
b9409e5310
@ -5,7 +5,8 @@
|
||||
// Please see LICENSE in the repository root for full details.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Compound
|
||||
import SwiftUI
|
||||
|
||||
enum SessionVerificationScreenViewModelAction {
|
||||
case finished
|
||||
@ -26,32 +27,32 @@ struct SessionVerificationScreenViewState: BindableState {
|
||||
let flow: SessionVerificationScreenFlow
|
||||
var verificationState: SessionVerificationScreenStateMachine.State
|
||||
|
||||
var headerImageName: String {
|
||||
var headerIcon: (keyPath: KeyPath<CompoundIcons, Image>, style: BigIcon.Style) {
|
||||
switch verificationState {
|
||||
case .initial:
|
||||
return "lock"
|
||||
return (\.devices, .defaultSolid)
|
||||
case .acceptingVerificationRequest:
|
||||
return "hourglass"
|
||||
return (\.devices, .defaultSolid)
|
||||
case .requestingVerification:
|
||||
return "hourglass"
|
||||
return (\.devices, .defaultSolid)
|
||||
case .verificationRequestAccepted:
|
||||
return "face.smiling"
|
||||
return (\.reaction, .defaultSolid)
|
||||
case .startingSasVerification:
|
||||
return "hourglass"
|
||||
return (\.devices, .defaultSolid)
|
||||
case .sasVerificationStarted:
|
||||
return "hourglass"
|
||||
return (\.devices, .defaultSolid)
|
||||
case .cancelling:
|
||||
return "hourglass"
|
||||
case .acceptingChallenge:
|
||||
return "hourglass"
|
||||
case .decliningChallenge:
|
||||
return "hourglass"
|
||||
return (\.lockSolid, .defaultSolid)
|
||||
case .showingChallenge:
|
||||
return "face.smiling"
|
||||
return (\.reaction, .defaultSolid)
|
||||
case .acceptingChallenge:
|
||||
return (\.reaction, .defaultSolid)
|
||||
case .decliningChallenge:
|
||||
return (\.reaction, .defaultSolid)
|
||||
case .verified:
|
||||
return "checkmark.shield"
|
||||
return (\.checkCircleSolid, .successSolid)
|
||||
case .cancelled:
|
||||
return "exclamationmark.shield"
|
||||
return (\.infoSolid, .alertSolid)
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,12 +61,12 @@ struct SessionVerificationScreenViewState: BindableState {
|
||||
case .initial:
|
||||
switch flow {
|
||||
case .initiator:
|
||||
return L10n.screenSessionVerificationOpenExistingSessionTitle
|
||||
return L10n.screenSessionVerificationUseAnotherDeviceTitle
|
||||
case .responder:
|
||||
return L10n.screenSessionVerificationRequestTitle
|
||||
}
|
||||
case .acceptingVerificationRequest:
|
||||
return L10n.screenSessionVerificationRequestTitle
|
||||
return L10n.screenSessionVerificationWaitingAnotherDeviceTitle
|
||||
case .requestingVerification:
|
||||
return L10n.screenSessionVerificationWaitingToAcceptTitle
|
||||
case .verificationRequestAccepted:
|
||||
@ -98,12 +99,12 @@ struct SessionVerificationScreenViewState: BindableState {
|
||||
case .initial:
|
||||
switch flow {
|
||||
case .initiator:
|
||||
return L10n.screenSessionVerificationOpenExistingSessionSubtitle
|
||||
return L10n.screenSessionVerificationUseAnotherDeviceSubtitle
|
||||
case .responder:
|
||||
return L10n.screenSessionVerificationRequestSubtitle
|
||||
}
|
||||
case .acceptingVerificationRequest:
|
||||
return L10n.screenSessionVerificationRequestSubtitle
|
||||
return L10n.screenSessionVerificationWaitingAnotherDeviceSubtitle
|
||||
case .requestingVerification:
|
||||
return L10n.screenSessionVerificationWaitingToAcceptSubtitle
|
||||
case .verificationRequestAccepted:
|
||||
|
@ -31,15 +31,10 @@ struct SessionVerificationScreen: View {
|
||||
@ViewBuilder
|
||||
private var screenHeader: some View {
|
||||
VStack(spacing: 0) {
|
||||
if context.viewState.verificationState == .initial {
|
||||
BigIcon(icon: \.lockSolid)
|
||||
.padding(.bottom, 16)
|
||||
} else {
|
||||
Image(systemName: context.viewState.headerImageName)
|
||||
.bigIcon()
|
||||
.padding(.bottom, 16)
|
||||
}
|
||||
|
||||
BigIcon(icon: context.viewState.headerIcon.keyPath,
|
||||
style: context.viewState.headerIcon.style)
|
||||
.padding(.bottom, 16)
|
||||
|
||||
Text(context.viewState.title ?? "")
|
||||
.font(.compound.headingMDBold)
|
||||
.multilineTextAlignment(.center)
|
||||
|
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Cancelled.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Cancelled.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Request-Accepted.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Request-Accepted.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Verified.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Verified.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Cancelled.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Cancelled.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Verified.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Verified.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Cancelled.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Cancelled.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Verified.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Verified.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Cancelled.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Cancelled.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Verified.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Verified.png
(Stored with Git LFS)
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user