mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:33:45 +00:00
Update Compound (#3803)
This commit is contained in:
@@ -102,8 +102,8 @@ struct BigIcon_Previews: PreviewProvider, TestablePreview {
|
||||
}
|
||||
|
||||
HStack(spacing: 20) {
|
||||
BigIcon(icon: \.error, style: .alertSolid)
|
||||
BigIcon(icon: \.error, style: .alert)
|
||||
BigIcon(icon: \.errorSolid, style: .alertSolid)
|
||||
BigIcon(icon: \.errorSolid, style: .alert)
|
||||
}
|
||||
|
||||
HStack(spacing: 20) {
|
||||
|
||||
@@ -201,7 +201,7 @@ struct CreateRoomScreen: View {
|
||||
} footer: {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
if let errorDescription = context.viewState.aliasErrors.errorDescription {
|
||||
Label(errorDescription, icon: \.error, iconSize: .xSmall, relativeTo: .compound.bodySM)
|
||||
Label(errorDescription, icon: \.errorSolid, iconSize: .xSmall, relativeTo: .compound.bodySM)
|
||||
.foregroundStyle(.compound.textCriticalPrimary)
|
||||
.font(.compound.bodySM)
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ struct EditRoomAddressScreen: View {
|
||||
} footer: {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
if let errorDescription = context.viewState.aliasErrors.errorDescription {
|
||||
Label(errorDescription, icon: \.error, iconSize: .xSmall, relativeTo: .compound.bodySM)
|
||||
Label(errorDescription, icon: \.errorSolid, iconSize: .xSmall, relativeTo: .compound.bodySM)
|
||||
.foregroundStyle(.compound.textCriticalPrimary)
|
||||
.font(.compound.bodySM)
|
||||
}
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ struct EncryptionResetScreen: View {
|
||||
|
||||
private var header: some View {
|
||||
VStack(spacing: 8) {
|
||||
BigIcon(icon: \.error, style: .alertSolid)
|
||||
BigIcon(icon: \.errorSolid, style: .alertSolid)
|
||||
.padding(.bottom, 8)
|
||||
|
||||
Text(L10n.screenEncryptionResetTitle)
|
||||
|
||||
+1
-1
@@ -317,7 +317,7 @@ private struct DownloadIndicatorView: View {
|
||||
var body: some View {
|
||||
if case let .media(mediaItem) = currentItem, mediaItem.downloadError != nil {
|
||||
VStack(spacing: 24) {
|
||||
CompoundIcon(\.error, size: .custom(48), relativeTo: .compound.headingLG)
|
||||
CompoundIcon(\.errorSolid, size: .custom(48), relativeTo: .compound.headingLG)
|
||||
.foregroundStyle(.compound.iconCriticalPrimary)
|
||||
.padding(.vertical, 24.5)
|
||||
.padding(.horizontal, 28.5)
|
||||
|
||||
@@ -253,7 +253,7 @@ struct JoinRoomScreen: View {
|
||||
}
|
||||
}
|
||||
} icon: {
|
||||
CompoundIcon(\.error)
|
||||
CompoundIcon(\.errorSolid)
|
||||
.foregroundStyle(.compound.iconCriticalPrimary)
|
||||
}
|
||||
.labelStyle(.custom(spacing: 12, alignment: .top))
|
||||
|
||||
@@ -178,7 +178,7 @@ struct QRCodeLoginScreen: View {
|
||||
|
||||
VStack(spacing: 4) {
|
||||
Label(L10n.screenQrCodeLoginInvalidScanStateSubtitle,
|
||||
icon: \.error,
|
||||
icon: \.errorSolid,
|
||||
iconSize: .medium,
|
||||
relativeTo: .compound.bodyMDSemibold)
|
||||
.labelStyle(.custom(spacing: 10))
|
||||
@@ -200,7 +200,7 @@ struct QRCodeLoginScreen: View {
|
||||
|
||||
VStack(spacing: 4) {
|
||||
Label(L10n.screenQrCodeLoginDeviceNotSignedInScanStateSubtitle,
|
||||
icon: \.error,
|
||||
icon: \.errorSolid,
|
||||
iconSize: .medium,
|
||||
relativeTo: .compound.bodyMDSemibold)
|
||||
.labelStyle(.custom(spacing: 10))
|
||||
@@ -273,7 +273,7 @@ struct QRCodeLoginScreen: View {
|
||||
case .connectionNotSecure:
|
||||
VStack(spacing: 40) {
|
||||
VStack(spacing: 16) {
|
||||
BigIcon(icon: \.error, style: .alert)
|
||||
BigIcon(icon: \.errorSolid, style: .alert)
|
||||
|
||||
VStack(spacing: 8) {
|
||||
Text(L10n.screenQrCodeLoginConnectionNoteSecureStateTitle)
|
||||
@@ -339,7 +339,7 @@ struct QRCodeLoginScreen: View {
|
||||
}
|
||||
|
||||
VStack(spacing: 16) {
|
||||
BigIcon(icon: \.error, style: .alert)
|
||||
BigIcon(icon: \.errorSolid, style: .alert)
|
||||
|
||||
VStack(spacing: 8) {
|
||||
Text(title)
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ struct ResolveVerifiedUserSendFailureScreen: View {
|
||||
|
||||
var header: some View {
|
||||
VStack(spacing: 8) {
|
||||
BigIcon(icon: \.error, style: .alertSolid)
|
||||
BigIcon(icon: \.errorSolid, style: .alertSolid)
|
||||
.padding(.bottom, 8)
|
||||
|
||||
Text(context.viewState.title)
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@ struct SecureBackupKeyBackupScreen: View {
|
||||
private var disableBackupSection: some View {
|
||||
VStack(spacing: 24) {
|
||||
VStack(spacing: 16) {
|
||||
BigIcon(icon: \.error, style: .alertSolid)
|
||||
BigIcon(icon: \.errorSolid, style: .alertSolid)
|
||||
|
||||
VStack(spacing: 8) {
|
||||
Text(L10n.screenKeyBackupDisableTitle)
|
||||
|
||||
@@ -228,7 +228,7 @@ private struct VerifiedUserSendFailureView: View {
|
||||
var body: some View {
|
||||
Button(action: action) {
|
||||
HStack(spacing: 8) {
|
||||
Label(title, icon: \.error, iconSize: .small, relativeTo: .compound.bodySMSemibold)
|
||||
Label(title, icon: \.errorSolid, iconSize: .small, relativeTo: .compound.bodySMSemibold)
|
||||
.font(.compound.bodySMSemibold)
|
||||
.foregroundStyle(.compound.textCriticalPrimary)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
|
||||
@@ -57,7 +57,7 @@ private struct TimelineItemSendInfoLabel: View {
|
||||
|
||||
var statusIcon: KeyPath<CompoundIcons, Image>? {
|
||||
switch sendInfo.status {
|
||||
case .sendingFailed: \.error
|
||||
case .sendingFailed: \.errorSolid
|
||||
case .encryptionAuthenticity(let authenticity): authenticity.icon
|
||||
case .none: nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user