From 9749b77a92c1604038ee53ef0c77fef4c385b788 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Mon, 13 Nov 2023 16:44:29 +0000
Subject: [PATCH] First round of icon updates. (#2076)
Update Compound too.
---
ElementX.xcodeproj/project.pbxproj | 2 +-
.../xcshareddata/swiftpm/Package.resolved | 2 +-
.../Contents.json | 2 +-
.../images/circle.imageset/circle.svg | 3 +++
.../add-location.imageset/Contents.json | 2 +-
.../add-location.imageset/Location Pin.svg | 3 +++
.../add-location.imageset/location.svg | 3 ---
.../photos-library.imageset/photos-library.svg | 3 ---
.../Contents.json | 2 +-
.../images/document.imageset/document.svg | 3 +++
.../decryption-error.imageset/Contents.json | 2 +-
.../decryption-error.svg | 3 ---
.../waiting-to-decrypt.svg | 4 ++++
.../images/home/compose.imageset/compose.svg | 3 ---
.../sign-out.imageset}/Contents.json | 2 +-
.../images/home/sign-out.imageset/sign-out.svg | 3 +++
.../media/microphone.imageset/microphone.svg | 5 -----
.../images/share-ios.imageset/Contents.json | 16 ++++++++++++++++
.../images/share-ios.imageset/share-ios.svg | 4 ++++
.../Localizations/en.lproj/Localizable.strings | 2 +-
ElementX/Sources/Generated/Assets.swift | 7 ++++---
ElementX/Sources/Generated/Strings.swift | 7 ++-----
.../BugReportScreen/View/BugReportScreen.swift | 2 +-
.../View/RoomAttachmentPicker.swift | 2 +-
.../Screens/HomeScreen/View/HomeScreen.swift | 2 +-
.../View/HomeScreenEmptyStateView.swift | 2 +-
.../HomeScreen/View/HomeScreenRoomList.swift | 4 ++--
.../View/HomeScreenUserMenuButton.swift | 8 ++++----
.../View/RoomDetailsEditScreen.swift | 7 ++-----
.../View/Replies/TimelineReplyView.swift | 16 ++++++++++------
.../View/Style/SwipeToReplyView.swift | 3 ++-
.../TimelineDeliveryStatusView.swift | 12 ++++++------
.../Timeline/EncryptedRoomTimelineView.swift | 4 ++--
.../SettingsScreen/View/SettingsScreen.swift | 2 +-
.../View/UserDetailsEditScreen.swift | 7 ++-----
UITests/Sources/UserSessionScreenTests.swift | 17 ++++++++---------
...-iPad-9th-generation.userSessionScreen-1.png | 4 ++--
...-iPad-9th-generation.userSessionScreen-2.png | 4 ++--
...-iPad-9th-generation.userSessionScreen-3.png | 4 ++--
...ad-9th-generation.userSessionScreenRTE-1.png | 4 ++--
...ad-9th-generation.userSessionScreenRTE-2.png | 4 ++--
...ad-9th-generation.userSessionScreenReply.png | 4 ++--
.../en-GB-iPhone-14.userSessionScreen-1.png | 4 ++--
.../en-GB-iPhone-14.userSessionScreen-2.png | 4 ++--
.../en-GB-iPhone-14.userSessionScreen-3.png | 4 ++--
.../en-GB-iPhone-14.userSessionScreenRTE-1.png | 4 ++--
.../en-GB-iPhone-14.userSessionScreenRTE-2.png | 4 ++--
.../en-GB-iPhone-14.userSessionScreenReply.png | 4 ++--
...-iPad-9th-generation.userSessionScreen-1.png | 4 ++--
...-iPad-9th-generation.userSessionScreen-2.png | 4 ++--
...-iPad-9th-generation.userSessionScreen-3.png | 4 ++--
...ad-9th-generation.userSessionScreenRTE-1.png | 4 ++--
...ad-9th-generation.userSessionScreenRTE-2.png | 4 ++--
...ad-9th-generation.userSessionScreenReply.png | 4 ++--
.../pseudo-iPhone-14.userSessionScreen-1.png | 4 ++--
.../pseudo-iPhone-14.userSessionScreen-2.png | 4 ++--
.../pseudo-iPhone-14.userSessionScreen-3.png | 4 ++--
.../pseudo-iPhone-14.userSessionScreenRTE-1.png | 4 ++--
.../pseudo-iPhone-14.userSessionScreenRTE-2.png | 4 ++--
.../pseudo-iPhone-14.userSessionScreenReply.png | 4 ++--
.../test_appLockSettingsScreen.Face-ID.png | 3 ---
...test_appLockSettingsScreen.No-Biometrics.png | 3 ---
.../test_appLockSettingsScreen.Touch-ID.png | 3 ---
.../PreviewTests/test_bugReport.1.png | 4 ++--
.../PreviewTests/test_bugReport.2.png | 4 ++--
.../test_encryptedRoomTimelineView.1.png | 4 ++--
.../test_encryptedRoomTimelineView.2.png | 4 ++--
.../PreviewTests/test_homeScreen.Empty.png | 4 ++--
.../PreviewTests/test_homeScreen.Loaded.png | 4 ++--
.../PreviewTests/test_homeScreen.Loading.png | 4 ++--
...eScreenEmptyStateView.Constrained-layout.png | 4 ++--
...t_homeScreenEmptyStateView.Normal-Layout.png | 4 ++--
.../test_homeScreenEmptyStateView.View.png | 4 ++--
.../test_messageComposer.Replying-in-thread.png | 4 ++--
.../test_messageComposer.Replying.png | 4 ++--
.../test_roomDetailsEditScreen.Normal.png | 4 ++--
.../PreviewTests/test_settingsScreen.1.png | 4 ++--
.../PreviewTests/test_swipeToReplyView.1.png | 4 ++--
.../test_timelineDeliveryStatusView.1.png | 4 ++--
.../test_timelineItemStyler.Bubbles.png | 4 ++--
.../test_timelineItemStyler.Plain.png | 4 ++--
.../PreviewTests/test_timelineReplyView.1.png | 4 ++--
.../test_userDetailsEditScreen.1.png | 4 ++--
project.yml | 2 +-
84 files changed, 182 insertions(+), 176 deletions(-)
rename ElementX/Resources/Assets.xcassets/images/{home/compose.imageset => circle.imageset}/Contents.json (87%)
create mode 100644 ElementX/Resources/Assets.xcassets/images/circle.imageset/circle.svg
create mode 100644 ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Location Pin.svg
delete mode 100644 ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/location.svg
delete mode 100644 ElementX/Resources/Assets.xcassets/images/composer/attachments/photos-library.imageset/photos-library.svg
rename ElementX/Resources/Assets.xcassets/images/{media/microphone.imageset => document.imageset}/Contents.json (86%)
create mode 100644 ElementX/Resources/Assets.xcassets/images/document.imageset/document.svg
delete mode 100644 ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/decryption-error.svg
create mode 100644 ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/waiting-to-decrypt.svg
delete mode 100644 ElementX/Resources/Assets.xcassets/images/home/compose.imageset/compose.svg
rename ElementX/Resources/Assets.xcassets/images/{composer/attachments/photos-library.imageset => home/sign-out.imageset}/Contents.json (85%)
create mode 100644 ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/sign-out.svg
delete mode 100644 ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/microphone.svg
create mode 100644 ElementX/Resources/Assets.xcassets/images/share-ios.imageset/Contents.json
create mode 100644 ElementX/Resources/Assets.xcassets/images/share-ios.imageset/share-ios.svg
delete mode 100644 UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Face-ID.png
delete mode 100644 UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.No-Biometrics.png
delete mode 100644 UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Touch-ID.png
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 9f488a23d..86db235d4 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -6656,7 +6656,7 @@
repositoryURL = "https://github.com/vector-im/compound-ios";
requirement = {
kind = revision;
- revision = 34dcd1e2960f3b0b7f50d6e7d020c108d5acf604;
+ revision = 849e5beaadfb449b53a28d41cc22cf303cc9045b;
};
};
9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index c66c4bd6a..59d0f3c26 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,7 +14,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/vector-im/compound-ios",
"state" : {
- "revision" : "34dcd1e2960f3b0b7f50d6e7d020c108d5acf604"
+ "revision" : "849e5beaadfb449b53a28d41cc22cf303cc9045b"
}
},
{
diff --git a/ElementX/Resources/Assets.xcassets/images/home/compose.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/circle.imageset/Contents.json
similarity index 87%
rename from ElementX/Resources/Assets.xcassets/images/home/compose.imageset/Contents.json
rename to ElementX/Resources/Assets.xcassets/images/circle.imageset/Contents.json
index 4d9c312e5..ebe71a156 100644
--- a/ElementX/Resources/Assets.xcassets/images/home/compose.imageset/Contents.json
+++ b/ElementX/Resources/Assets.xcassets/images/circle.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "compose.svg",
+ "filename" : "circle.svg",
"idiom" : "universal"
}
],
diff --git a/ElementX/Resources/Assets.xcassets/images/circle.imageset/circle.svg b/ElementX/Resources/Assets.xcassets/images/circle.imageset/circle.svg
new file mode 100644
index 000000000..d1de88397
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/circle.imageset/circle.svg
@@ -0,0 +1,3 @@
+
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Contents.json
index 1ce0c9fbd..491f696dd 100644
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Contents.json
+++ b/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "location.svg",
+ "filename" : "Location Pin.svg",
"idiom" : "universal"
}
],
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Location Pin.svg b/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Location Pin.svg
new file mode 100644
index 000000000..448a2667b
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Location Pin.svg
@@ -0,0 +1,3 @@
+
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/location.svg b/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/location.svg
deleted file mode 100644
index 6911eb3ef..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/location.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/photos-library.imageset/photos-library.svg b/ElementX/Resources/Assets.xcassets/images/composer/attachments/photos-library.imageset/photos-library.svg
deleted file mode 100644
index b4ecae946..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/photos-library.imageset/photos-library.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/document.imageset/Contents.json
similarity index 86%
rename from ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/Contents.json
rename to ElementX/Resources/Assets.xcassets/images/document.imageset/Contents.json
index d69e18648..52a00ccc6 100644
--- a/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/Contents.json
+++ b/ElementX/Resources/Assets.xcassets/images/document.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "microphone.svg",
+ "filename" : "document.svg",
"idiom" : "universal"
}
],
diff --git a/ElementX/Resources/Assets.xcassets/images/document.imageset/document.svg b/ElementX/Resources/Assets.xcassets/images/document.imageset/document.svg
new file mode 100644
index 000000000..045f1704e
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/document.imageset/document.svg
@@ -0,0 +1,3 @@
+
diff --git a/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/Contents.json
index f0f774524..2da9ba02c 100644
--- a/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/Contents.json
+++ b/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "decryption-error.svg",
+ "filename" : "waiting-to-decrypt.svg",
"idiom" : "universal"
}
],
diff --git a/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/decryption-error.svg b/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/decryption-error.svg
deleted file mode 100644
index 7128a0d9c..000000000
--- a/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/decryption-error.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/waiting-to-decrypt.svg b/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/waiting-to-decrypt.svg
new file mode 100644
index 000000000..65a508f67
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/waiting-to-decrypt.svg
@@ -0,0 +1,4 @@
+
diff --git a/ElementX/Resources/Assets.xcassets/images/home/compose.imageset/compose.svg b/ElementX/Resources/Assets.xcassets/images/home/compose.imageset/compose.svg
deleted file mode 100644
index d96fc5d50..000000000
--- a/ElementX/Resources/Assets.xcassets/images/home/compose.imageset/compose.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/photos-library.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/Contents.json
similarity index 85%
rename from ElementX/Resources/Assets.xcassets/images/composer/attachments/photos-library.imageset/Contents.json
rename to ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/Contents.json
index d83afc1d8..ec08532ca 100644
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/photos-library.imageset/Contents.json
+++ b/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "photos-library.svg",
+ "filename" : "sign-out.svg",
"idiom" : "universal"
}
],
diff --git a/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/sign-out.svg b/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/sign-out.svg
new file mode 100644
index 000000000..334b95320
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/sign-out.svg
@@ -0,0 +1,3 @@
+
diff --git a/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/microphone.svg b/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/microphone.svg
deleted file mode 100644
index 7808332fc..000000000
--- a/ElementX/Resources/Assets.xcassets/images/media/microphone.imageset/microphone.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/Contents.json
new file mode 100644
index 000000000..51dd0ba5c
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+ "images" : [
+ {
+ "filename" : "share-ios.svg",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "preserves-vector-representation" : true,
+ "template-rendering-intent" : "template"
+ }
+}
diff --git a/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/share-ios.svg b/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/share-ios.svg
new file mode 100644
index 000000000..bf7a17548
--- /dev/null
+++ b/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/share-ios.svg
@@ -0,0 +1,4 @@
+
diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
index f71ec1084..5197d675c 100644
--- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings
+++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
@@ -135,6 +135,7 @@
"common_refreshing" = "Refreshing…";
"common_replying_to" = "Replying to %1$@";
"common_report_a_bug" = "Report a bug";
+"common_report_a_problem" = "Report a problem";
"common_report_submitted" = "Report submitted";
"common_rich_text_editor" = "Rich text editor";
"common_room" = "Room";
@@ -174,7 +175,6 @@
"common_voice_message" = "Voice message";
"common_waiting" = "Waiting…";
"common_waiting_for_decryption_key" = "Waiting for this message";
-"common.report_a_problem" = "Report a problem";
"common_poll_end_confirmation" = "Are you sure you want to end this poll?";
"common_poll_summary" = "Poll: %1$@";
"common_verify_device" = "Verify device";
diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift
index 091612281..83cb57d50 100644
--- a/ElementX/Sources/Generated/Assets.swift
+++ b/ElementX/Sources/Generated/Assets.swift
@@ -33,10 +33,10 @@ internal enum Asset {
internal enum Images {
internal static let appLogo = ImageAsset(name: "images/app-logo")
internal static let serverSelectionIcon = ImageAsset(name: "images/server-selection-icon")
+ internal static let circle = ImageAsset(name: "images/circle")
internal static let closeCircle = ImageAsset(name: "images/close-circle")
internal static let addLocation = ImageAsset(name: "images/add-location")
internal static let attachment = ImageAsset(name: "images/attachment")
- internal static let photosLibrary = ImageAsset(name: "images/photos-library")
internal static let takePhoto = ImageAsset(name: "images/take-photo")
internal static let textFormatting = ImageAsset(name: "images/text-formatting")
internal static let bold = ImageAsset(name: "images/bold")
@@ -57,10 +57,11 @@ internal enum Asset {
internal static let textFormat = ImageAsset(name: "images/text-format")
internal static let underline = ImageAsset(name: "images/underline")
internal static let unindent = ImageAsset(name: "images/unindent")
+ internal static let document = ImageAsset(name: "images/document")
internal static let decryptionError = ImageAsset(name: "images/decryption-error")
internal static let endedPoll = ImageAsset(name: "images/ended-poll")
- internal static let compose = ImageAsset(name: "images/compose")
internal static let settingsIconWithBadge = ImageAsset(name: "images/settings-icon-with-badge")
+ internal static let signOut = ImageAsset(name: "images/sign-out")
internal static let launchBackground = ImageAsset(name: "images/launch-background")
internal static let locationMarker = ImageAsset(name: "images/location-marker")
internal static let locationPin = ImageAsset(name: "images/location-pin")
@@ -68,10 +69,10 @@ internal enum Asset {
internal static let locationPointer = ImageAsset(name: "images/location-pointer")
internal static let mediaPause = ImageAsset(name: "images/media-pause")
internal static let mediaPlay = ImageAsset(name: "images/media-play")
- internal static let microphone = ImageAsset(name: "images/microphone")
internal static let secureBackupIcon = ImageAsset(name: "images/secure-backup-icon")
internal static let secureBackupOff = ImageAsset(name: "images/secure-backup-off")
internal static let secureBackupOn = ImageAsset(name: "images/secure-backup-on")
+ internal static let shareIos = ImageAsset(name: "images/share-ios")
internal static let addReaction = ImageAsset(name: "images/add-reaction")
internal static let copy = ImageAsset(name: "images/copy")
internal static let editOutline = ImageAsset(name: "images/edit-outline")
diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift
index 60d7ed856..6dbd697a1 100644
--- a/ElementX/Sources/Generated/Strings.swift
+++ b/ElementX/Sources/Generated/Strings.swift
@@ -310,6 +310,8 @@ public enum L10n {
}
/// Report a bug
public static var commonReportABug: String { return L10n.tr("Localizable", "common_report_a_bug") }
+ /// Report a problem
+ public static var commonReportAProblem: String { return L10n.tr("Localizable", "common_report_a_problem") }
/// Report submitted
public static var commonReportSubmitted: String { return L10n.tr("Localizable", "common_report_submitted") }
/// Rich text editor
@@ -1569,11 +1571,6 @@ public enum L10n {
/// Edit poll
public static var editPoll: String { return L10n.tr("Localizable", "action.edit_poll") }
}
-
- public enum Common {
- /// Report a problem
- public static var reportAProblem: String { return L10n.tr("Localizable", "common.report_a_problem") }
- }
}
// swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces
diff --git a/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift b/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift
index 1b75cf0b2..01a5ea8e7 100644
--- a/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift
+++ b/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift
@@ -35,7 +35,7 @@ struct BugReportScreen: View {
.disabled(context.viewState.shouldDisableInteraction)
.scrollDismissesKeyboard(.immediately)
.compoundList()
- .navigationTitle(L10n.commonReportABug)
+ .navigationTitle(L10n.commonReportAProblem)
.navigationBarTitleDisplayMode(.inline)
.toolbar { toolbar }
.interactiveDismissDisabled()
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift b/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift
index 43e18ff7a..b27da72ca 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift
@@ -44,7 +44,7 @@ struct RoomAttachmentPicker: View {
context.showAttachmentPopover = false
context.send(viewAction: .displayMediaPicker)
} label: {
- Label(L10n.screenRoomAttachmentSourceGallery, iconAsset: Asset.Images.photosLibrary)
+ Label(L10n.screenRoomAttachmentSourceGallery, icon: \.image)
.labelStyle(.menuSheet)
}
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPhotoLibrary)
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
index f5f5e6236..f953e8721 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
@@ -226,7 +226,7 @@ struct HomeScreen: View {
Button {
context.send(viewAction: .startChat)
} label: {
- CompoundIcon(customImage: Asset.Images.compose.swiftUIImage)
+ CompoundIcon(\.edit)
}
.accessibilityLabel(L10n.actionStartChat)
.accessibilityIdentifier(A11yIdentifiers.homeScreen.startChat)
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift
index 6a42dc1be..e846f6a35 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift
@@ -36,7 +36,7 @@ struct HomeScreenEmptyStateView: View {
.padding(.bottom, 12)
Button { context.send(viewAction: .startChat) } label: {
- Label(L10n.actionStartChat, iconAsset: Asset.Images.compose)
+ Label(L10n.actionStartChat, icon: \.edit)
.font(.compound.bodyLGSemibold)
.foregroundColor(.compound.textOnSolidPrimary)
.padding(.vertical, 6)
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift
index df9c6d225..aad9403e5 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift
@@ -39,13 +39,13 @@ struct HomeScreenRoomList: View {
Button {
context.send(viewAction: .showRoomDetails(roomIdentifier: room.id))
} label: {
- Label(L10n.commonSettings, systemImage: "gearshape")
+ Label(L10n.commonSettings, icon: \.settings)
}
Button(role: .destructive) {
context.send(viewAction: .leaveRoom(roomIdentifier: room.id))
} label: {
- Label(L10n.actionLeaveRoom, systemImage: "rectangle.portrait.and.arrow.right")
+ Label(L10n.actionLeaveRoom, icon: \.leave)
}
}
}
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift
index 5a228bbe4..ddc13d72c 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift
@@ -18,7 +18,7 @@ import Compound
import SwiftUI
struct HomeScreenUserMenuButton: View {
- @Environment(\.colorScheme) var colorScheme
+ @Environment(\.colorScheme) private var colorScheme
@ObservedObject var context: HomeScreenViewModel.Context
@@ -42,19 +42,19 @@ struct HomeScreenUserMenuButton: View {
}
Section {
MatrixUserShareLink(userID: context.viewState.userID) {
- Label(L10n.actionInvite, systemImage: "square.and.arrow.up")
+ Label(L10n.actionInvite, iconAsset: Asset.Images.shareIos)
}
Button {
context.send(viewAction: .userMenu(action: .feedback))
} label: {
- Label(L10n.commonReportABug, systemImage: "ladybug")
+ Label(L10n.commonReportAProblem, icon: \.chatProblem)
}
}
Section {
Button(role: .destructive) {
context.send(viewAction: .userMenu(action: .logout))
} label: {
- Label(L10n.screenSignoutPreferenceItem, systemImage: "rectangle.portrait.and.arrow.right")
+ Label(L10n.screenSignoutPreferenceItem, iconAsset: Asset.Images.signOut)
}
}
} label: {
diff --git a/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift b/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
index 2df2183ed..dccaed485 100644
--- a/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
+++ b/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
@@ -122,15 +122,12 @@ struct RoomDetailsEditScreen: View {
}
private var avatarOverlayIcon: some View {
- Image(systemName: "camera")
- .font(.system(size: 14, weight: .semibold))
- .padding(3)
- .imageScale(.small)
+ CompoundIcon(customImage: Asset.Images.editing.swiftUIImage, size: .xSmall, relativeTo: .compound.bodyLG)
.foregroundColor(.white)
+ .padding(3)
.background {
Circle()
.foregroundColor(.black)
- .aspectRatio(1, contentMode: .fill)
}
}
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift b/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
index 9a1645bde..4bb8fe376 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
@@ -14,6 +14,7 @@
// limitations under the License.
//
+import Compound
import SwiftUI
enum TimelineReplyViewPlacement {
@@ -43,7 +44,7 @@ struct TimelineReplyView: View {
ReplyView(sender: sender,
plainBody: content.body,
formattedBody: nil,
- icon: .init(kind: .systemIcon("doc.text.fill"), cornerRadii: iconCornerRadii))
+ icon: .init(kind: .iconAsset(Asset.Images.document), cornerRadii: iconCornerRadii))
case .image(let content):
ReplyView(sender: sender,
plainBody: content.body,
@@ -66,12 +67,12 @@ struct TimelineReplyView: View {
ReplyView(sender: sender,
plainBody: L10n.commonVoiceMessage,
formattedBody: nil,
- icon: .init(kind: .icon(Asset.Images.microphone.name), cornerRadii: iconCornerRadii))
+ icon: .init(kind: .icon(\.micOnOutline), cornerRadii: iconCornerRadii))
case .location:
ReplyView(sender: sender,
plainBody: L10n.commonSharedLocation,
formattedBody: nil,
- icon: .init(kind: .icon(Asset.Images.locationMarker.name), cornerRadii: iconCornerRadii))
+ icon: .init(kind: .iconAsset(Asset.Images.addLocation), cornerRadii: iconCornerRadii))
}
default:
LoadingReplyView()
@@ -100,7 +101,8 @@ struct TimelineReplyView: View {
enum Kind {
case mediaSource(MediaSourceProxy)
case systemIcon(String)
- case icon(String)
+ case iconAsset(ImageAsset)
+ case icon(KeyPath)
}
let kind: Kind
@@ -191,11 +193,13 @@ struct TimelineReplyView: View {
.resizable()
.aspectRatio(contentMode: .fit)
.padding(8.0)
- case .icon(let iconName):
- Image(iconName)
+ case .iconAsset(let asset):
+ Image(asset: asset)
.resizable()
.aspectRatio(contentMode: .fit)
.padding(8.0)
+ case .icon(let keyPath):
+ CompoundIcon(keyPath, size: .small, relativeTo: .body)
}
}
}
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift
index d514650f4..35cbd1155 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift
@@ -14,13 +14,14 @@
// limitations under the License.
//
+import Compound
import SwiftUI
struct SwipeToReplyView: View {
let timelineItem: RoomTimelineItemProtocol
var body: some View {
- Image(systemName: "arrowshape.turn.up.left")
+ CompoundIcon(customImage: Asset.Images.reply.swiftUIImage)
.foregroundColor(.compound.iconPrimary)
.accessibilityHidden(true)
}
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
index ecd8dc139..27dd82c57 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
@@ -14,7 +14,9 @@
// limitations under the License.
//
+import Compound
import SwiftUI
+
struct TimelineDeliveryStatusView: View {
enum Status {
case sending
@@ -23,20 +25,18 @@ struct TimelineDeliveryStatusView: View {
let deliveryStatus: Status
- private var systemImageName: String {
+ private var icon: CompoundIcon {
switch deliveryStatus {
case .sending:
- return "circle"
+ return CompoundIcon(customImage: Asset.Images.circle.swiftUIImage, size: .xSmall, relativeTo: .compound.bodyMD)
case .sent:
- return "checkmark.circle"
+ return CompoundIcon(\.checkCircle, size: .xSmall, relativeTo: .compound.bodyMD)
}
}
var body: some View {
- Image(systemName: systemImageName)
- .resizable()
+ icon
.foregroundColor(.compound.iconSecondary)
- .frame(width: 16.0, height: 16.0)
}
}
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
index 5b3cc1144..f13b0bd4c 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
@@ -54,12 +54,12 @@ struct EncryptedRoomTimelineView_Previews: PreviewProvider, TestablePreview {
static var body: some View {
VStack(alignment: .leading, spacing: 20.0) {
- EncryptedRoomTimelineView(timelineItem: itemWith(text: "Text",
+ EncryptedRoomTimelineView(timelineItem: itemWith(text: L10n.commonWaitingForDecryptionKey,
timestamp: "Now",
isOutgoing: false,
senderId: "Bob"))
- EncryptedRoomTimelineView(timelineItem: itemWith(text: "Some other text",
+ EncryptedRoomTimelineView(timelineItem: itemWith(text: L10n.commonWaitingForDecryptionKey,
timestamp: "Later",
isOutgoing: true,
senderId: "Anne"))
diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
index e0342af24..315bfceff 100644
--- a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
@@ -132,7 +132,7 @@ struct SettingsScreen: View {
})
.accessibilityIdentifier(A11yIdentifiers.settingsScreen.screenLock)
- ListRow(label: .default(title: L10n.commonReportABug,
+ ListRow(label: .default(title: L10n.commonReportAProblem,
systemIcon: .ladybug),
kind: .navigationLink {
context.send(viewAction: .reportBug)
diff --git a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
index a6ccec8a5..67e4a9fb6 100644
--- a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
+++ b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
@@ -89,15 +89,12 @@ struct UserDetailsEditScreen: View {
}
private var avatarOverlayIcon: some View {
- Image(systemName: "camera")
- .font(.system(size: 14, weight: .semibold))
- .padding(3)
- .imageScale(.small)
+ CompoundIcon(customImage: Asset.Images.editing.swiftUIImage, size: .xSmall, relativeTo: .compound.bodyLG)
.foregroundColor(.white)
+ .padding(4)
.background {
Circle()
.foregroundColor(.black)
- .aspectRatio(1, contentMode: .fill)
}
}
diff --git a/UITests/Sources/UserSessionScreenTests.swift b/UITests/Sources/UserSessionScreenTests.swift
index beb0d9495..9ccd4a450 100644
--- a/UITests/Sources/UserSessionScreenTests.swift
+++ b/UITests/Sources/UserSessionScreenTests.swift
@@ -18,13 +18,14 @@ import XCTest
@MainActor
class UserSessionScreenTests: XCTestCase {
+ let firstRoomName = "Foundation 🔭🪐🌌"
+
func testUserSessionFlows() async throws {
- let roomName = "First room"
let app = Application.launch(.userSessionScreen)
try await app.assertScreenshot(.userSessionScreen, step: 1)
- app.buttons[A11yIdentifiers.homeScreen.roomName(roomName)].tap()
- XCTAssert(app.staticTexts[roomName].waitForExistence(timeout: 5.0))
+ app.buttons[A11yIdentifiers.homeScreen.roomName(firstRoomName)].tap()
+ XCTAssert(app.staticTexts[firstRoomName].waitForExistence(timeout: 5.0))
try await Task.sleep(for: .seconds(1))
try await app.assertScreenshot(.userSessionScreen, step: 2)
@@ -33,10 +34,9 @@ class UserSessionScreenTests: XCTestCase {
}
func testUserSessionReply() async throws {
- let roomName = "First room"
let app = Application.launch(.userSessionScreenReply, disableTimelineAccessibility: false)
- app.buttons[A11yIdentifiers.homeScreen.roomName(roomName)].tap()
- XCTAssert(app.staticTexts[roomName].waitForExistence(timeout: 5.0))
+ app.buttons[A11yIdentifiers.homeScreen.roomName(firstRoomName)].tap()
+ XCTAssert(app.staticTexts[firstRoomName].waitForExistence(timeout: 5.0))
try await Task.sleep(for: .seconds(1))
let cell = app.cells.firstMatch
@@ -46,11 +46,10 @@ class UserSessionScreenTests: XCTestCase {
}
func testUserSessionRTE() async throws {
- let roomName = "First room"
let app = Application.launch(.userSessionScreenRTE)
- app.buttons[A11yIdentifiers.homeScreen.roomName(roomName)].tap()
- XCTAssert(app.staticTexts[roomName].waitForExistence(timeout: 5.0))
+ app.buttons[A11yIdentifiers.homeScreen.roomName(firstRoomName)].tap()
+ XCTAssert(app.staticTexts[firstRoomName].waitForExistence(timeout: 5.0))
try await Task.sleep(for: .seconds(1))
app.buttons[A11yIdentifiers.roomScreen.composerToolbar.openComposeOptions].tap()
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png
index 2fe14d78b..601edb42b 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d1e3ffb14e05b669a5ce627c5cf331297a507ba03249835cc2918973a3536150
-size 222336
+oid sha256:7a7bfba0292332b0054ebdb8fd2bc9f2324c8e33b58a38d3fe3c65d41b63a48b
+size 305736
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png
index 78bf93171..88c60031e 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:96333fd9d9a25f44270c98ad5804a8efae632ef3fa9b73fc4a59a3833cfc247d
-size 344307
+oid sha256:f82ae167864896d8a406946a37d4a8e050d27b7d86a553e4b3fe77eaa94c0fd1
+size 436074
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png
index b0a1062dd..96e1875f9 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1a4221f050527a5e2c8e64d9a262742a956b400fdc18e337d5a72870b7c91554
-size 416882
+oid sha256:9421d841970f9a0a55f0e8e5a6bd0c9e7b9ace70e44a978242d23688c0542024
+size 512460
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-1.png
index 216f5c0f2..cd2f7cfd5 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c60fe60bb1d92121f10630e953ffbd64fdacb63cf356d19aaa472abb78a90cd3
-size 422275
+oid sha256:8b51d3b6c2d0f60dbafe9632c7e9e6fa2eacbf1d98c4a2a1e7d84ccd991cced6
+size 520150
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-2.png
index 0d446a6b7..08990f8a3 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenRTE-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e23fee5e336e75147fe9684309553a52a911d01c01fe3a1b66a060cec0ba939b
-size 339906
+oid sha256:c379a4b2d5ef40b39489d1e579555f03238cb8948128b8acb03280e05e876da5
+size 435584
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenReply.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenReply.png
index dbe8191ca..f4f9fe8c3 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenReply.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreenReply.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e57456b4d66fd9e8ef14332e04ea4f9b9044928d88fa68af0a84bf86d95797bb
-size 344190
+oid sha256:d21d1bf2f887f023eed9e9be316195dfea5b53e3b2a10a5ee464146b59924d7d
+size 439778
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png
index 944728f43..5b63cd5be 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:953af0037decc9cfc38cee5adbab115e532eaa13e607e921d7a34471237ff77d
-size 157912
+oid sha256:45e6ae2461507f5c02e285133462363909a9413a01103e421d4c6f850370e12b
+size 293670
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png
index 81750aa1e..f39a116c2 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:df8c62ba319a1c4f0ab9723d915818ffc6a635650f1e090125c082bebac5fc16
-size 302840
+oid sha256:816d4ec9223f506a9e03abb4fc29e42723673f283fdd446653d6ddc427450f7b
+size 325695
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png
index 73f64c39b..45bc3eb8c 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9b92d7f4ef945899d5d8b23b1bbae2e08461d5028d6f6d8ff60b8d81399fb7c7
-size 258997
+oid sha256:5fbd2dd53ff84ec3a9036ff7d3d5f6a49e43942d66f63f28f22c9984a9005442
+size 282985
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-1.png
index 954366fb6..1ead9c45e 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f52777176b599e6d65ceb16435a6eb926437151583decfe4f98e210cd91cf0a9
-size 251831
+oid sha256:33286bc063afcb81379c75f25e9fd7836e9f4c14afa67e4a15468e7daa73555d
+size 275758
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-2.png
index 87a8032fd..da792ff46 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenRTE-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cb8405485df6e11bc0ab7ed663ab0d72351cbe55e58d4cbd85459697e47bd418
-size 278072
+oid sha256:87ad5df9164b4e32eea572b4a7b8324e4e38be7d2969f7ed299be026b3e1e27d
+size 300839
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenReply.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenReply.png
index 3a69134ba..35b6b61cb 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenReply.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreenReply.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:08631c081496ad03f683e70e4311ce311ea11fedee23fd5c62d85ff10e333b76
-size 290808
+oid sha256:607228cb80941071d44afcc618e9e98dc6abc02bb423c84c20843c7fb0e85ee5
+size 313852
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png
index 903a19ced..506502814 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9a74fbcb1b5bc33c984b5b750dab88c5d38917fa9a43244e5fdbb1d0664abb99
-size 224444
+oid sha256:ae120e6804bfcb559e2d1484789214ce3e233d08cd91edf550b8d91255fe0045
+size 307901
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png
index f06c786d5..05e017bdc 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:456010b21ffef53e1c96c9f53fe9df980d6f046e88e6351b872c524e635eb26f
-size 346744
+oid sha256:eb0ef61d257e195249918b116d535285446992b39ff8ceb7c4519b23e9105322
+size 438470
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png
index 34b91b715..31cde9294 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3cda8015384c0b3d91ba9d7535aaece9cc2b5c53ad1440aa18183298bbc7b2de
-size 407027
+oid sha256:1a85df9877f3063704bacd8f06ee8395c9142c2bf934001a8d00142ed7f2db8e
+size 504977
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-1.png
index 37f93c9f9..071436a20 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b0a9818e31758c2d973e74b755859cda09779ab5c5c792cf6bde923222c15384
-size 407862
+oid sha256:d22f5bed316cf4ff579575b378825ef7a9c5b58ebb1cbe81425b5b33d3c46a06
+size 508302
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-2.png
index 5c8d0aea5..326a0b396 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenRTE-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dffcc64d1c1913d6e5a3fa0595dfb4cadf9419e021b3e673605095ccaad536ff
-size 342332
+oid sha256:cade275826c4e95775ae88d0542973382e2c1e6a1c2b639ce0f84d66af11d8d9
+size 437932
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenReply.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenReply.png
index e0bd4dde4..a0d88d872 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenReply.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreenReply.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:55c653491fe5b30ba654b0ec1357457f87b109d4bf578bd4e17131d3c8e08de2
-size 346459
+oid sha256:25ae4acc855a3b4699c45fbb08fbf6f78b8773d3d9796f20287fc3e73bd3422c
+size 442194
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png
index d26a78d0d..61da39152 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8cd707592c8e8e62eb992f647345fe69aa8733904d223cc41b31b45d50c202d7
-size 161452
+oid sha256:7174d289197b64d0f3baddeb7721fb041788b96a6b7b1ad41eb8467258cdd59c
+size 297199
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png
index f073710c7..bb4114aab 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5240857b02ecf019172c0975a1a43e538413dfd77bf43450fa4591cb794f277b
-size 302906
+oid sha256:93b79a98f9d1314d3275261848a95c74f6738f4494be6e235120a59b7ca52392
+size 325624
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png
index 8544e355e..b15493c18 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dd4fece7b5145ca090717585f9c8668712f2a9827f1fd3792fdadb248549ab9d
-size 257729
+oid sha256:4395a1c2243d5a0156d8cbd15d1ce8d8efaa2855bcd7c2c852845a9dbd5a4965
+size 281743
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-1.png
index 269bfab40..93ec3f9ed 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:944f1b23769621a4af85467627b2718263ca0428f470acf20dad9c53f0385547
-size 260139
+oid sha256:716df69caae90b32320699cb31d999977f74eb0ce24017535feab92e76f6cad7
+size 284156
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-2.png
index 7ca6a64ce..7e32f9b95 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenRTE-2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:65bb3dc1fd8849e90105af0fc8cdd6d4393134e293b53ddd7b1eed246746eb7b
-size 278234
+oid sha256:bbe644a07cd1b4f10b4435d485e8978cda2f9e7af34a4d3dd3bbad14d77739e0
+size 300850
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenReply.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenReply.png
index 754a728bb..746cbda67 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenReply.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreenReply.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5301c7453157be451d8446685dad02e31a1eb94c24492bbbac5ad21d03e09c8e
-size 290983
+oid sha256:43bcdd64a76e2e29e2bc0c417b9ebf88c1945066ced926a164e3bcea4917cad0
+size 313863
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Face-ID.png b/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Face-ID.png
deleted file mode 100644
index 39382eabc..000000000
--- a/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Face-ID.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:905d8d16cfce1540a91a3c8ef7d4295b844d2aab4c3ed3035230277acb56e228
-size 94357
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.No-Biometrics.png b/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.No-Biometrics.png
deleted file mode 100644
index d5eec5905..000000000
--- a/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.No-Biometrics.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f918886d8da2987f6ae26762267557ce2f7d7f0b02ce985de56caa3fb7ee305c
-size 83101
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Touch-ID.png b/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Touch-ID.png
deleted file mode 100644
index f2ce95a39..000000000
--- a/UnitTests/__Snapshots__/PreviewTests/test_appLockSettingsScreen.Touch-ID.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7ac5d864e7480b3bf9c284aee3bc69d235cf14071e527937cd8e0a31b38cf37
-size 93927
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_bugReport.1.png b/UnitTests/__Snapshots__/PreviewTests/test_bugReport.1.png
index d79b3e282..61d4b8cf5 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_bugReport.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_bugReport.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:37508f1d958949c54767d69aa2aee5745f5c5928252048cf82e7a412ec95e93f
-size 177875
+oid sha256:5ae0ec5bf85972c150ba144ed92323706e62fe5409652d48114f96094352d9f0
+size 177920
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png b/UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png
index 1060fb4f4..2186c0ab8 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:597a26b088fb0b4a84501a9d6894784f4d43d3ecd48de9058b61488a4474a518
-size 269425
+oid sha256:d4b1d940f4b6dec8ca5a0c1dc9b1e55588df21fc480c322f7b34e09dbf066a15
+size 269470
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png
index c6665177d..d54666416 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d636c6611e9f22e2abefeeb376527832c7bc9a8e742e27b5a8e0033e3a71e5d0
-size 102978
+oid sha256:f208bc177a0e2782737d8e719202a4939c0323a83a7b588822e256f325b675aa
+size 112630
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png b/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png
index ed0185be7..f2f02cd04 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c519ed834c359078179dfd70c3c966056d83df03e877dc32ed13f9514d85285d
-size 101548
+oid sha256:c72d0e6b8b5afed7b51586dba2e74cfc692011987fe3c7e754ca0416bcacd453
+size 110745
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png
index c7eef51ad..c593693a3 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c5f2eae998924cbab9b778d88e2b697c9f523c3ac7b13dcfd724b4e6d2c7103c
-size 106964
+oid sha256:2b391abfdd2172848ae1a2510d50ea597e337425793560d01959b57429972ba2
+size 106343
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png
index 2635f5a49..0386b0752 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5958eb51b8c3c3754bd88b3ee9bf35a50f7ae7926d732652fe891453bc7f5b15
-size 297345
+oid sha256:5d6d5a6fa799a80f4057b45c490d47fd32d191034a7f035d30bd5b31e1a6855b
+size 297086
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png
index c2d640219..3e60ab78b 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c6c666c6cbc038d44297261b7d99ced48b54a17e1a4ce6d09e8b108e80161bfc
-size 97371
+oid sha256:213d0979ea41ce5e5a5bbaf91864818b72cbc279d4ac488ffdf01c5e456949dc
+size 97007
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png
index 29dd577e0..3ee722452 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4bd953b8de479a8763296ca25596d306d8e7aadd228bc7a1378bd55646104ca1
-size 151928
+oid sha256:c2ca57c531d847da14ab639cabe6a1eb37e615cf3a28db4749e6c6ca88f26800
+size 151676
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png
index d0aeb7dba..a1305474d 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0d8e3da5f6c909789f030dab7bfed34ea2528a25eb925d78a060bc8aa4f4e48b
-size 104859
+oid sha256:a2dafbdd32b395dd007ba56f506e2bde32f4c9817ed31d11d76067f93c34055f
+size 104560
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png
index 7e0ab01d9..3699048d2 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2a183d69a78a2f5ce87376f80383df8e8431c34b1b1b74dcb34c4b68c599d1ed
-size 79667
+oid sha256:36c15a7c06eeaa93f80de7c125247f729ad994950dff289331248fdafff51a82
+size 79368
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png
index 7da9e331b..af0e907a8 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:548a5f88cf7c34567b799ed60f668b896fd529ee0e639a067a81559ec391523d
-size 228009
+oid sha256:867ea722d971520d4e0e56caa723967cc5bf13d78ba7ca029a576c30a8684e9b
+size 227746
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png
index 7da9e331b..af0e907a8 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:548a5f88cf7c34567b799ed60f668b896fd529ee0e639a067a81559ec391523d
-size 228009
+oid sha256:867ea722d971520d4e0e56caa723967cc5bf13d78ba7ca029a576c30a8684e9b
+size 227746
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png
index 93afc077a..a19a3046e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fcc4b3875152e9b3108524d632f740b090ce896bd09f742e181b2003baeec649
-size 103581
+oid sha256:d9fd2b7edf2446e90d13a6cdefe89eb2701e9e46d66c21cfad55a5b600f0b990
+size 102675
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png
index ba0004d30..8ac42d10c 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:49f8dcc11df3c4a0df9119efdfc6ef3f23271125723dcbed1c5f78ab8695421c
-size 178128
+oid sha256:b30e9a51aac90844f4cce2d8dfc0045992e7f09438c9ed2bfaa9332f35b2df46
+size 178165
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png
index 2ac7bc197..4bba3a66e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c1680eb64a85e7bf9c7c157e08c6d28a3ad56f9d285f689d45940d85d249de27
-size 56895
+oid sha256:864c6a06bd55be132bf5724f1513160b3d687c21f1a2bac1dd378810ff787fb4
+size 55934
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png
index a05809b45..98b75c6a0 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:86685b6b11130797e0a051849822ee226528f93c56b2b8cfeaa4dfb3107b6283
-size 59339
+oid sha256:4c6224afef24a4f0e11bf4d2c1544c94560ace5ec81b48786cce54b7108a120e
+size 57678
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
index cf665aa6b..f3d673625 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:57e8726250cc61e3849446af2e21706058bd6a68b04590ad147dc46cad571651
-size 97651
+oid sha256:6ec34fa70dca5b3eafe2b0b87659279ed37edb3c07f739794223df3f5ef03e79
+size 95434
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
index 22ff16069..0a1a5f438 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dfc14aa24ffe7d071f4c8d4efb2ec519e2dc0ebed9f4cffa6dffdc12dfafa129
-size 131639
+oid sha256:fb0e3b02b8b4e1fcaf169e2ed5b93c6dbe7df8d19d7c12d1f118e33a03b1b0af
+size 129381
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
index b91ab637d..ee528929f 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:23ba537d93a78dd7c69dc1d9482ae972ba50f0eb05dadbcb0f0ecc2b9fea2695
-size 145983
+oid sha256:951649857272370a71eab991644638096894ba81f129a5ed386b7c37a2e4e9af
+size 145642
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png
index 3399b204f..d6c1edf4f 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f3b7151f59fa0848903069f41a415db65b59fd9f40105a8ec4ad0ba83b6c38a1
-size 102442
+oid sha256:004e3d149e91b27f7ba408bb829ce10c986f83a771ddf1e196369cf7c8d89d60
+size 101672
diff --git a/project.yml b/project.yml
index 736287e74..dac004662 100644
--- a/project.yml
+++ b/project.yml
@@ -49,7 +49,7 @@ packages:
# path: ../matrix-rust-sdk
Compound:
url: https://github.com/vector-im/compound-ios
- revision: 34dcd1e2960f3b0b7f50d6e7d020c108d5acf604
+ revision: 849e5beaadfb449b53a28d41cc22cf303cc9045b
# path: ../compound-ios
AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events