letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Update Compound (#3803)

Browse Source
This commit is contained in:
Doug
2025-02-20 14:15:26 +00:00
committed by GitHub
parent 442b4cc46b
commit 772e754773
47 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX.xcodeproj/project.pbxproj
View File

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

6
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

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

4
ElementX/Sources/Other/SwiftUI/Views/BigIcon.swift
View File

@@ -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) {

2
ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
View File

@@ -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)
}

2
ElementX/Sources/Screens/EditRoomAddressScreen/View/EditRoomAddressScreen.swift
View File

@@ -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)
}

2
ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/View/EncryptionResetScreen.swift
View File

@@ -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)

2
ElementX/Sources/Screens/FilePreviewScreen/View/TimelineMediaPreviewController.swift
View File

@@ -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)

2
ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
View File

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

8
ElementX/Sources/Screens/QRCodeLoginScreen/View/QRCodeLoginScreen.swift
View File

@@ -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)

2
ElementX/Sources/Screens/ResolveVerifiedUserSendFailureScreen/View/ResolveVerifiedUserSendFailureScreen.swift
View File

@@ -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)

2
ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
View File

@@ -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)

2
ElementX/Sources/Screens/Timeline/View/ItemMenu/TimelineItemMenu.swift
View File

@@ -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)

2
ElementX/Sources/Screens/Timeline/View/Style/TimelineItemSendInfoLabel.swift
View File

@@ -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
}

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-en-GB.Empty.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9625fad4ed5ef0e9e84e46cc4e030d1a458d69b51f4086f9cbaceb95ddd1ec5
size 91709
oid sha256:1fe33098a8a1f471e940c20f87ca503edeb3c5a2b915ca7078a92be3b6c4893f
size 91968

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-en-GB.Loaded.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9252f86d18981def421d061cca8fde42279e70c63d2354b6d3c97f6eb8e0e950
size 251390
oid sha256:28dda0e7e42c8993b24859077f7736ebba90722a323ec276cb4a7fadb215b06f
size 251491

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-pseudo.Empty.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a9fbbaacd071a3903cfd194072d6177aa466f6e0701007aaf13925aadfd22db
size 96020
oid sha256:28b1d648fd8fe1449fc6dad1bbcf896b772e6a112b70ae631299844b5ab05284
size 96261

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPad-pseudo.Loaded.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb24454e77eec133c268bbfa3281c7ddd81643bfd7e0aa16578c783bb0a01b83
size 254289
oid sha256:878ae02263738b63aa41917459838fe689270e083cc7d8b93b0835e1414893b7
size 254380

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-en-GB.Empty.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d96438c624f5b1bcd690c82bacb133e08a830b0ee1a07f888fe845a60bfa1e6a
size 50998
oid sha256:1a38fa94b2faac182076185e6549faa5520df087179d4e5ee7ea81756711c0e0
size 51104

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-en-GB.Loaded.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b81d11805cb2ad13987f3f067c4e05519d59ef4412942b5ec292bee6cf0f0ced
size 187141
oid sha256:7da27948fbd8af5c2ca0ea5df995709e90676b4b3fbe15042e4014b7097794c1
size 187267

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-pseudo.Empty.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c06f6941486a88c19d4b67d7b0afa91678649a535a30b696891fbb0815ac76b
size 61299
oid sha256:ee46378a0a2f6c170ae02bf6d10591893cd884decb94a04c2fc954101342673d
size 61412

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreen-iPhone-16-pseudo.Loaded.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3873a268f6fe529abeac744c43a9aeffadcbe7caeaa5dcaf2d3d1c647aa1f86a
size 189812
oid sha256:3e687c9ed958011886d3f91e7d3123f735292c746663223ca0cafb5dcaca2e21
size 189974

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPad-en-GB.Constrained-layout.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPad-en-GB.Normal-Layout.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPad-en-GB.View.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPad-pseudo.Constrained-layout.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPad-pseudo.Normal-Layout.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPad-pseudo.View.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPhone-16-en-GB.Constrained-layout.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPhone-16-en-GB.Normal-Layout.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPhone-16-en-GB.View.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPhone-16-pseudo.Normal-Layout.png LFS
View File

Binary file not shown.

BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView-iPhone-16-pseudo.View.png LFS
View File

Binary file not shown.

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_locationMarkerView-iPad-en-GB.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32afbd707d3bd0de31b6c19bdb1804331ad22c79f0b9ccb6a3300aa2d0b84781
size 82790
oid sha256:50d10b115b5448860bf484c75d09bd7691f008cc02940b390a2190a57faacac6
size 82843

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_locationMarkerView-iPad-pseudo.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32afbd707d3bd0de31b6c19bdb1804331ad22c79f0b9ccb6a3300aa2d0b84781
size 82790
oid sha256:50d10b115b5448860bf484c75d09bd7691f008cc02940b390a2190a57faacac6
size 82843

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_locationMarkerView-iPhone-16-en-GB.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38e553820c66f6a56203164a86f4165dc6fc4ecdfe0783b24cf7b4ba46bf1646
size 40679
oid sha256:c273a9fe94f224d4c2bbc169ad08f776d241cf3e8e501a0a8e366842ccacd45d
size 40721

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_locationMarkerView-iPhone-16-pseudo.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38e553820c66f6a56203164a86f4165dc6fc4ecdfe0783b24cf7b4ba46bf1646
size 40679
oid sha256:c273a9fe94f224d4c2bbc169ad08f776d241cf3e8e501a0a8e366842ccacd45d
size 40721

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsEditScreen-iPhone-16-en-GB.Editable.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfc14a626a36d9d81d4728b8da2ed58a16055194c5f844593ad749558d078242
size 57630
oid sha256:71ef0cb9fa807170ea46eaf729f914d3aa6072db40f6bb6b3da195e159d312fe
size 57632

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsEditScreen-iPhone-16-pseudo.Editable.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa1210ee381281688088ed723aa9f5bd7a7621ead20c26d7f3814ff68dcfb25a
size 67951
oid sha256:42e3611e6bcbc792bcd5db838331c607615586eb28864ae8b42ec2fcf80fbbd1
size 67954

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-en-GB.Unencrypted.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6afbe4ba26f7ec22df84f6a67ae568a8d57103615a280dd6f4bbdc210ab0e575
size 140623
oid sha256:6409225f639f1f96ab82c1bcd47b7b6f8dcac396d1e7e097b03c3c463b895eb7
size 140630

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_timelineItemMenu-iPad-pseudo.Unencrypted.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d99f435700232ceb21bb26799e2560048fde545090992b3015d3d3d722927b34
size 147069
oid sha256:cbaa648eca59aeb96c51efa0cd3e92ab51580c1e1e9cb957ee6105594efd8a18
size 147078

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-en-GB.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:927b14d401572b4b4393dfe06c8e044888d0682a1d71b2a554b958e0ec0116be
size 81861
oid sha256:c9d1903ddcd00dc637ebee2d55038c6b9415341bc0f1ef46d2432c47ecd2ae2b
size 81888

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPad-pseudo.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:927b14d401572b4b4393dfe06c8e044888d0682a1d71b2a554b958e0ec0116be
size 81861
oid sha256:c9d1903ddcd00dc637ebee2d55038c6b9415341bc0f1ef46d2432c47ecd2ae2b
size 81888

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-16-en-GB.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c83bae6f66905ff811d79688da3c6b2c191fadce4cfb1528dd24ad8bfeeeea84
size 39044
oid sha256:ae635e987f00becec9a2c643f37a217ff5d188fa368e71358efb2d5118d7069b
size 39296

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_timelineItemSendInfoLabel-iPhone-16-pseudo.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c83bae6f66905ff811d79688da3c6b2c191fadce4cfb1528dd24ad8bfeeeea84
size 39044
oid sha256:ae635e987f00becec9a2c643f37a217ff5d188fa368e71358efb2d5118d7069b
size 39296

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_userDetailsEditScreen-iPhone-16-en-GB.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bed3dc390726186b5c56404238b55f8e9969b647d694a6971d569dd7c9abc10f
size 54861
oid sha256:c6770b25d3438b9557a55e14a7ecb00b91fa0cc50d22c2115ccf5694bd97576c
size 54862

4
PreviewTests/Sources/__Snapshots__/PreviewTests/test_userDetailsEditScreen-iPhone-16-pseudo.1.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a306a56f19116333567795febba79638ddd909b71091896e42b979e9ec921777
size 58204
oid sha256:924ee73990f5f009e691803dc007bab28adf25f9752b36bc6a11a53cbf953fef
size 58208

2
project.yml
View File

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