Update Compound (#3803)

This commit is contained in:
Doug
2025-02-20 14:15:26 +00:00
committed by GitHub
parent d8b88f1cf8
commit c2e10b910a
47 changed files with 86 additions and 86 deletions
+1 -1
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" */ = {
@@ -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"
} }
}, },
{ {
@@ -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) {
@@ -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)
} }
@@ -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)
} }
@@ -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)
@@ -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)
@@ -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))
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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
} }
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a9625fad4ed5ef0e9e84e46cc4e030d1a458d69b51f4086f9cbaceb95ddd1ec5 oid sha256:1fe33098a8a1f471e940c20f87ca503edeb3c5a2b915ca7078a92be3b6c4893f
size 91709 size 91968
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9252f86d18981def421d061cca8fde42279e70c63d2354b6d3c97f6eb8e0e950 oid sha256:28dda0e7e42c8993b24859077f7736ebba90722a323ec276cb4a7fadb215b06f
size 251390 size 251491
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7a9fbbaacd071a3903cfd194072d6177aa466f6e0701007aaf13925aadfd22db oid sha256:28b1d648fd8fe1449fc6dad1bbcf896b772e6a112b70ae631299844b5ab05284
size 96020 size 96261
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:fb24454e77eec133c268bbfa3281c7ddd81643bfd7e0aa16578c783bb0a01b83 oid sha256:878ae02263738b63aa41917459838fe689270e083cc7d8b93b0835e1414893b7
size 254289 size 254380
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d96438c624f5b1bcd690c82bacb133e08a830b0ee1a07f888fe845a60bfa1e6a oid sha256:1a38fa94b2faac182076185e6549faa5520df087179d4e5ee7ea81756711c0e0
size 50998 size 51104
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b81d11805cb2ad13987f3f067c4e05519d59ef4412942b5ec292bee6cf0f0ced oid sha256:7da27948fbd8af5c2ca0ea5df995709e90676b4b3fbe15042e4014b7097794c1
size 187141 size 187267
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4c06f6941486a88c19d4b67d7b0afa91678649a535a30b696891fbb0815ac76b oid sha256:ee46378a0a2f6c170ae02bf6d10591893cd884decb94a04c2fc954101342673d
size 61299 size 61412
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:3873a268f6fe529abeac744c43a9aeffadcbe7caeaa5dcaf2d3d1c647aa1f86a oid sha256:3e687c9ed958011886d3f91e7d3123f735292c746663223ca0cafb5dcaca2e21
size 189812 size 189974
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4ebfe8de438d992fe8f51f33bcc757b7b124242b8c752f58b703df377759b9c5 oid sha256:1a0483e13bdaf4ba89efd66af72a1e5b72a01e35e98a8f6b6c0eb239b3d46ba1
size 131949 size 132092
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:004961a95f94a2d910c175468250bc3eb5879dda0f08e8e98d4d99345dfc805a oid sha256:ca1566dff45bdebe22c427763e61cfe59cc2cd83fdf5e751657ea239c7b20160
size 100470 size 100606
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:3ac1c08e99d74400b1e3000041fec9951479ee3be336f5f5487abcc075742d3c oid sha256:0f4da4a43c774563e70426e976698f1b2b0584e6ec0c63122b77a03b3742db68
size 84219 size 84293
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:da0ade7d5a64ebf42467efa00662a3f3a7ec8dbfa2f6d40710641b29f39e5f85 oid sha256:8bec1e3d4e349e0cd7a2ed2545c3cc4ada2533a9f886f04f0f065932ea0099df
size 147825 size 147946
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:cad2edf4827ac3148449f461e91c167c1316e21ae6165dcf2b9e30b94aa43936 oid sha256:7d346bbaf3d86e4a294db17fae4e62bc7d0e4739a239db2113169c2f084697cc
size 107744 size 107870
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:775c8131149ea9bcd94c8fd911d4590513c2cf5fe090f7cc6d5d6528eb87fc87 oid sha256:971a1dd030e50e125d5c453ce060df41d4ec18f26f250d85944e0a9bcbeff15a
size 87672 size 87814
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:84a080dc610406b1c6396b9a401b453fa511a236ee917ed9e5f9bf9f5bd47267 oid sha256:6dd7ec07434421960615022cd25669801fe6c4305f7d8021fa7354abcf981f29
size 89041 size 89027
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:57e4333b991949aa51353efc807373474e74267387d5c9fd9e9d066fc78935b2 oid sha256:dc60b8357c38a3f64285cfd3ecff7d24f023c1d1f709ba8fa3fa570849f63f76
size 59888 size 59874
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:20aec65f2738655c7659d7fa9cb921eb345586b0fe0a6d8d9b0776a0a1063b10 oid sha256:fbae03c8fcd74ebe8a6849170cbfd9cf68f561fd64aba2ff37b1d2f04f806e81
size 44060 size 44034
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:154c41d09cb4447ace60c0e35429fe5fd069d78e97e7d34cb0615b2207641b44 oid sha256:a694d31dca174b6350c2173dddda92f1c3cf0f6a3294f2cfbcfb92a5cd0da82b
size 83632 size 83606
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:5bb5d96f21af345a2be8eec4fcee1e648102949339e1596fe8468cfefa19aa0d oid sha256:572e59f9fbe201c12e016009b4651af1b3faaa9c91ca5b7ae0d5905c30ea548a
size 54364 size 54355
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:32afbd707d3bd0de31b6c19bdb1804331ad22c79f0b9ccb6a3300aa2d0b84781 oid sha256:50d10b115b5448860bf484c75d09bd7691f008cc02940b390a2190a57faacac6
size 82790 size 82843
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:32afbd707d3bd0de31b6c19bdb1804331ad22c79f0b9ccb6a3300aa2d0b84781 oid sha256:50d10b115b5448860bf484c75d09bd7691f008cc02940b390a2190a57faacac6
size 82790 size 82843
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:38e553820c66f6a56203164a86f4165dc6fc4ecdfe0783b24cf7b4ba46bf1646 oid sha256:c273a9fe94f224d4c2bbc169ad08f776d241cf3e8e501a0a8e366842ccacd45d
size 40679 size 40721
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:38e553820c66f6a56203164a86f4165dc6fc4ecdfe0783b24cf7b4ba46bf1646 oid sha256:c273a9fe94f224d4c2bbc169ad08f776d241cf3e8e501a0a8e366842ccacd45d
size 40679 size 40721
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:cfc14a626a36d9d81d4728b8da2ed58a16055194c5f844593ad749558d078242 oid sha256:71ef0cb9fa807170ea46eaf729f914d3aa6072db40f6bb6b3da195e159d312fe
size 57630 size 57632
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:aa1210ee381281688088ed723aa9f5bd7a7621ead20c26d7f3814ff68dcfb25a oid sha256:42e3611e6bcbc792bcd5db838331c607615586eb28864ae8b42ec2fcf80fbbd1
size 67951 size 67954
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:6afbe4ba26f7ec22df84f6a67ae568a8d57103615a280dd6f4bbdc210ab0e575 oid sha256:6409225f639f1f96ab82c1bcd47b7b6f8dcac396d1e7e097b03c3c463b895eb7
size 140623 size 140630
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d99f435700232ceb21bb26799e2560048fde545090992b3015d3d3d722927b34 oid sha256:cbaa648eca59aeb96c51efa0cd3e92ab51580c1e1e9cb957ee6105594efd8a18
size 147069 size 147078
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:927b14d401572b4b4393dfe06c8e044888d0682a1d71b2a554b958e0ec0116be oid sha256:c9d1903ddcd00dc637ebee2d55038c6b9415341bc0f1ef46d2432c47ecd2ae2b
size 81861 size 81888
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:927b14d401572b4b4393dfe06c8e044888d0682a1d71b2a554b958e0ec0116be oid sha256:c9d1903ddcd00dc637ebee2d55038c6b9415341bc0f1ef46d2432c47ecd2ae2b
size 81861 size 81888
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:c83bae6f66905ff811d79688da3c6b2c191fadce4cfb1528dd24ad8bfeeeea84 oid sha256:ae635e987f00becec9a2c643f37a217ff5d188fa368e71358efb2d5118d7069b
size 39044 size 39296
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:c83bae6f66905ff811d79688da3c6b2c191fadce4cfb1528dd24ad8bfeeeea84 oid sha256:ae635e987f00becec9a2c643f37a217ff5d188fa368e71358efb2d5118d7069b
size 39044 size 39296
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:bed3dc390726186b5c56404238b55f8e9969b647d694a6971d569dd7c9abc10f oid sha256:c6770b25d3438b9557a55e14a7ecb00b91fa0cc50d22c2115ccf5694bd97576c
size 54861 size 54862
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a306a56f19116333567795febba79638ddd909b71091896e42b979e9ec921777 oid sha256:924ee73990f5f009e691803dc007bab28adf25f9752b36bc6a11a53cbf953fef
size 58204 size 58208
+1 -1
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