Update Compound (#3803)

This commit is contained in:
Doug 2025-02-20 14:15:26 +00:00 committed by GitHub
parent d8b88f1cf8
commit c2e10b910a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
47 changed files with 86 additions and 86 deletions

View File

@ -8646,7 +8646,7 @@
repositoryURL = "https://github.com/element-hq/compound-ios"; repositoryURL = "https://github.com/element-hq/compound-ios";
requirement = { requirement = {
kind = revision; kind = revision;
revision = 9325643cb4d22150881c5bf79e1e6e3c5a87ea89; revision = 5af528a2925816ab0ee1945c6321e7c476baca8a;
}; };
}; };
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = { F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {

View File

@ -6,8 +6,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-design-tokens", "location" : "https://github.com/element-hq/compound-design-tokens",
"state" : { "state" : {
"revision" : "a6e96fb4436a4945423a8c068001093af4b7b315", "revision" : "3e3f83f61ad48acc8532636a773ccdeafd3834fe",
"version" : "3.0.1" "version" : "4.0.0"
} }
}, },
{ {
@ -15,7 +15,7 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-ios", "location" : "https://github.com/element-hq/compound-ios",
"state" : { "state" : {
"revision" : "9325643cb4d22150881c5bf79e1e6e3c5a87ea89" "revision" : "5af528a2925816ab0ee1945c6321e7c476baca8a"
} }
}, },
{ {

View File

@ -102,8 +102,8 @@ struct BigIcon_Previews: PreviewProvider, TestablePreview {
} }
HStack(spacing: 20) { HStack(spacing: 20) {
BigIcon(icon: \.error, style: .alertSolid) BigIcon(icon: \.errorSolid, style: .alertSolid)
BigIcon(icon: \.error, style: .alert) BigIcon(icon: \.errorSolid, style: .alert)
} }
HStack(spacing: 20) { HStack(spacing: 20) {

View File

@ -201,7 +201,7 @@ struct CreateRoomScreen: View {
} footer: { } footer: {
VStack(alignment: .leading, spacing: 12) { VStack(alignment: .leading, spacing: 12) {
if let errorDescription = context.viewState.aliasErrors.errorDescription { 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) .foregroundStyle(.compound.textCriticalPrimary)
.font(.compound.bodySM) .font(.compound.bodySM)
} }

View File

@ -27,7 +27,7 @@ struct EditRoomAddressScreen: View {
} footer: { } footer: {
VStack(alignment: .leading, spacing: 12) { VStack(alignment: .leading, spacing: 12) {
if let errorDescription = context.viewState.aliasErrors.errorDescription { 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) .foregroundStyle(.compound.textCriticalPrimary)
.font(.compound.bodySM) .font(.compound.bodySM)
} }

View File

@ -40,7 +40,7 @@ struct EncryptionResetScreen: View {
private var header: some View { private var header: some View {
VStack(spacing: 8) { VStack(spacing: 8) {
BigIcon(icon: \.error, style: .alertSolid) BigIcon(icon: \.errorSolid, style: .alertSolid)
.padding(.bottom, 8) .padding(.bottom, 8)
Text(L10n.screenEncryptionResetTitle) Text(L10n.screenEncryptionResetTitle)

View File

@ -317,7 +317,7 @@ private struct DownloadIndicatorView: View {
var body: some View { var body: some View {
if case let .media(mediaItem) = currentItem, mediaItem.downloadError != nil { if case let .media(mediaItem) = currentItem, mediaItem.downloadError != nil {
VStack(spacing: 24) { VStack(spacing: 24) {
CompoundIcon(\.error, size: .custom(48), relativeTo: .compound.headingLG) CompoundIcon(\.errorSolid, size: .custom(48), relativeTo: .compound.headingLG)
.foregroundStyle(.compound.iconCriticalPrimary) .foregroundStyle(.compound.iconCriticalPrimary)
.padding(.vertical, 24.5) .padding(.vertical, 24.5)
.padding(.horizontal, 28.5) .padding(.horizontal, 28.5)

View File

@ -253,7 +253,7 @@ struct JoinRoomScreen: View {
} }
} }
} icon: { } icon: {
CompoundIcon(\.error) CompoundIcon(\.errorSolid)
.foregroundStyle(.compound.iconCriticalPrimary) .foregroundStyle(.compound.iconCriticalPrimary)
} }
.labelStyle(.custom(spacing: 12, alignment: .top)) .labelStyle(.custom(spacing: 12, alignment: .top))

View File

@ -178,7 +178,7 @@ struct QRCodeLoginScreen: View {
VStack(spacing: 4) { VStack(spacing: 4) {
Label(L10n.screenQrCodeLoginInvalidScanStateSubtitle, Label(L10n.screenQrCodeLoginInvalidScanStateSubtitle,
icon: \.error, icon: \.errorSolid,
iconSize: .medium, iconSize: .medium,
relativeTo: .compound.bodyMDSemibold) relativeTo: .compound.bodyMDSemibold)
.labelStyle(.custom(spacing: 10)) .labelStyle(.custom(spacing: 10))
@ -200,7 +200,7 @@ struct QRCodeLoginScreen: View {
VStack(spacing: 4) { VStack(spacing: 4) {
Label(L10n.screenQrCodeLoginDeviceNotSignedInScanStateSubtitle, Label(L10n.screenQrCodeLoginDeviceNotSignedInScanStateSubtitle,
icon: \.error, icon: \.errorSolid,
iconSize: .medium, iconSize: .medium,
relativeTo: .compound.bodyMDSemibold) relativeTo: .compound.bodyMDSemibold)
.labelStyle(.custom(spacing: 10)) .labelStyle(.custom(spacing: 10))
@ -273,7 +273,7 @@ struct QRCodeLoginScreen: View {
case .connectionNotSecure: case .connectionNotSecure:
VStack(spacing: 40) { VStack(spacing: 40) {
VStack(spacing: 16) { VStack(spacing: 16) {
BigIcon(icon: \.error, style: .alert) BigIcon(icon: \.errorSolid, style: .alert)
VStack(spacing: 8) { VStack(spacing: 8) {
Text(L10n.screenQrCodeLoginConnectionNoteSecureStateTitle) Text(L10n.screenQrCodeLoginConnectionNoteSecureStateTitle)
@ -339,7 +339,7 @@ struct QRCodeLoginScreen: View {
} }
VStack(spacing: 16) { VStack(spacing: 16) {
BigIcon(icon: \.error, style: .alert) BigIcon(icon: \.errorSolid, style: .alert)
VStack(spacing: 8) { VStack(spacing: 8) {
Text(title) Text(title)

View File

@ -29,7 +29,7 @@ struct ResolveVerifiedUserSendFailureScreen: View {
var header: some View { var header: some View {
VStack(spacing: 8) { VStack(spacing: 8) {
BigIcon(icon: \.error, style: .alertSolid) BigIcon(icon: \.errorSolid, style: .alertSolid)
.padding(.bottom, 8) .padding(.bottom, 8)
Text(context.viewState.title) Text(context.viewState.title)

View File

@ -42,7 +42,7 @@ struct SecureBackupKeyBackupScreen: View {
private var disableBackupSection: some View { private var disableBackupSection: some View {
VStack(spacing: 24) { VStack(spacing: 24) {
VStack(spacing: 16) { VStack(spacing: 16) {
BigIcon(icon: \.error, style: .alertSolid) BigIcon(icon: \.errorSolid, style: .alertSolid)
VStack(spacing: 8) { VStack(spacing: 8) {
Text(L10n.screenKeyBackupDisableTitle) Text(L10n.screenKeyBackupDisableTitle)

View File

@ -228,7 +228,7 @@ private struct VerifiedUserSendFailureView: View {
var body: some View { var body: some View {
Button(action: action) { Button(action: action) {
HStack(spacing: 8) { HStack(spacing: 8) {
Label(title, icon: \.error, iconSize: .small, relativeTo: .compound.bodySMSemibold) Label(title, icon: \.errorSolid, iconSize: .small, relativeTo: .compound.bodySMSemibold)
.font(.compound.bodySMSemibold) .font(.compound.bodySMSemibold)
.foregroundStyle(.compound.textCriticalPrimary) .foregroundStyle(.compound.textCriticalPrimary)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)

View File

@ -57,7 +57,7 @@ private struct TimelineItemSendInfoLabel: View {
var statusIcon: KeyPath<CompoundIcons, Image>? { var statusIcon: KeyPath<CompoundIcons, Image>? {
switch sendInfo.status { switch sendInfo.status {
case .sendingFailed: \.error case .sendingFailed: \.errorSolid
case .encryptionAuthenticity(let authenticity): authenticity.icon case .encryptionAuthenticity(let authenticity): authenticity.icon
case .none: nil case .none: nil
} }

View File

@ -65,7 +65,7 @@ packages:
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/element-hq/compound-ios url: https://github.com/element-hq/compound-ios
revision: 9325643cb4d22150881c5bf79e1e6e3c5a87ea89 revision: 5af528a2925816ab0ee1945c6321e7c476baca8a
# path: ../compound-ios # path: ../compound-ios
AnalyticsEvents: AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events url: https://github.com/matrix-org/matrix-analytics-events