diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index ce5d2504a..4aab80aa1 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -6884,7 +6884,7 @@
repositoryURL = "https://github.com/element-hq/compound-ios";
requirement = {
kind = revision;
- revision = 787d62f7388ed7cc7812dcbf8a3f090e793cdb12;
+ revision = b2d1227d8628a28dafb85ae057a8df4bb7279029;
};
};
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index b4a952c4f..bd1b033da 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-design-tokens.git",
"state" : {
- "revision" : "f006a14218e279f81f2ab9398d8ebae58e87e25f",
- "version" : "0.1.1"
+ "revision" : "d7c3bba963d6b7ffab862c3293eb242a8932a0c1",
+ "version" : "1.0.0"
}
},
{
@@ -14,7 +14,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-ios",
"state" : {
- "revision" : "787d62f7388ed7cc7812dcbf8a3f090e793cdb12"
+ "revision" : "b2d1227d8628a28dafb85ae057a8df4bb7279029"
}
},
{
@@ -263,7 +263,7 @@
{
"identity" : "swiftui-introspect",
"kind" : "remoteSourceControl",
- "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
+ "location" : "https://github.com/siteline/SwiftUI-Introspect",
"state" : {
"revision" : "b94da693e57eaf79d16464b8b7c90d09cba4e290",
"version" : "0.9.2"
diff --git a/ElementX/Resources/Assets.xcassets/images/block.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/block.imageset/Contents.json
deleted file mode 100644
index 74a902708..000000000
--- a/ElementX/Resources/Assets.xcassets/images/block.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "block.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/block.imageset/block.svg b/ElementX/Resources/Assets.xcassets/images/block.imageset/block.svg
deleted file mode 100644
index 520f45622..000000000
--- a/ElementX/Resources/Assets.xcassets/images/block.imageset/block.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/circle.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/circle.imageset/Contents.json
deleted file mode 100644
index ebe71a156..000000000
--- a/ElementX/Resources/Assets.xcassets/images/circle.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "circle.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/circle.imageset/circle.svg b/ElementX/Resources/Assets.xcassets/images/circle.imageset/circle.svg
deleted file mode 100644
index d1de88397..000000000
--- a/ElementX/Resources/Assets.xcassets/images/circle.imageset/circle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/Contents.json
deleted file mode 100644
index 9aa8a10fc..000000000
--- a/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "images" : [
- {
- "filename" : "url_preview_close_dark.pdf",
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- },
- "properties" : {
- "preserves-vector-representation" : true
- }
-}
diff --git a/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/url_preview_close_dark.pdf b/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/url_preview_close_dark.pdf
deleted file mode 100644
index c2b155fab..000000000
--- a/ElementX/Resources/Assets.xcassets/images/close-circle.imageset/url_preview_close_dark.pdf
+++ /dev/null
@@ -1,116 +0,0 @@
-%PDF-1.7
-
-1 0 obj
- << /ExtGState << /E1 << /ca 0.800000 >> >> >>
-endobj
-
-2 0 obj
- << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-/E1 gs
-1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
-0.223529 0.250980 0.286275 scn
-24.000000 12.000000 m
-24.000000 5.372583 18.627417 0.000000 12.000000 0.000000 c
-5.372583 0.000000 0.000000 5.372583 0.000000 12.000000 c
-0.000000 18.627417 5.372583 24.000000 12.000000 24.000000 c
-18.627417 24.000000 24.000000 18.627417 24.000000 12.000000 c
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 7.999756 5.805014 cm
-0.662745 0.698039 0.737255 scn
-0.707107 10.902368 m
-0.316583 11.292892 -0.316582 11.292892 -0.707107 10.902368 c
--1.097631 10.511844 -1.097631 9.878678 -0.707107 9.488154 c
-0.707107 10.902368 l
-h
-7.292891 1.488155 m
-7.683415 1.097631 8.316580 1.097631 8.707105 1.488155 c
-9.097629 1.878679 9.097629 2.511844 8.707105 2.902369 c
-7.292891 1.488155 l
-h
--0.707107 9.488154 m
-7.292891 1.488155 l
-8.707105 2.902369 l
-0.707107 10.902368 l
--0.707107 9.488154 l
-h
-f
-n
-Q
-q
--1.000000 -0.000000 -0.000000 1.000000 16.000488 5.805014 cm
-0.662745 0.698039 0.737255 scn
-0.707107 10.902368 m
-0.316582 11.292892 -0.316583 11.292892 -0.707107 10.902368 c
--1.097631 10.511844 -1.097631 9.878678 -0.707107 9.488154 c
-0.707107 10.902368 l
-h
-7.292893 1.488155 m
-7.683417 1.097631 8.316583 1.097631 8.707107 1.488155 c
-9.097631 1.878679 9.097631 2.511845 8.707107 2.902369 c
-7.292893 1.488155 l
-h
--0.707107 9.488154 m
-7.292893 1.488155 l
-8.707107 2.902369 l
-0.707107 10.902368 l
--0.707107 9.488154 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
- 1439
-endobj
-
-4 0 obj
- << /Annots []
- /Type /Page
- /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
- /Resources 1 0 R
- /Contents 2 0 R
- /Parent 5 0 R
- >>
-endobj
-
-5 0 obj
- << /Kids [ 4 0 R ]
- /Count 1
- /Type /Pages
- >>
-endobj
-
-6 0 obj
- << /Type /Catalog
- /Pages 5 0 R
- >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000074 00000 n
-0000001569 00000 n
-0000001592 00000 n
-0000001765 00000 n
-0000001839 00000 n
-trailer
-<< /ID [ (some) (id) ]
- /Root 6 0 R
- /Size 7
->>
-startxref
-1898
-%%EOF
\ No newline at end of file
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/attachments/Contents.json
deleted file mode 100644
index 73c00596a..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
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
deleted file mode 100644
index 491f696dd..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "Location Pin.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/composer/attachments/add-location.imageset/Location Pin.svg b/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Location Pin.svg
deleted file mode 100644
index 448a2667b..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/add-location.imageset/Location Pin.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/attachment.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/attachments/attachment.imageset/Contents.json
deleted file mode 100644
index fa6949006..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/attachment.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "attachment.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/composer/attachments/attachment.imageset/attachment.svg b/ElementX/Resources/Assets.xcassets/images/composer/attachments/attachment.imageset/attachment.svg
deleted file mode 100644
index 44904305a..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/attachment.imageset/attachment.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/attachments/take-photo.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/attachments/take-photo.imageset/Contents.json
deleted file mode 100644
index e57a0a451..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/take-photo.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "take-photo.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/composer/attachments/take-photo.imageset/take-photo.svg b/ElementX/Resources/Assets.xcassets/images/composer/attachments/take-photo.imageset/take-photo.svg
deleted file mode 100644
index 940568111..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/attachments/take-photo.imageset/take-photo.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/bold.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/bold.imageset/Contents.json
deleted file mode 100644
index f9adaec1f..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/bold.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "bold.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/composer/bold.imageset/bold.svg b/ElementX/Resources/Assets.xcassets/images/composer/bold.imageset/bold.svg
deleted file mode 100644
index faabbf569..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/bold.imageset/bold.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/bullet-list.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/bullet-list.imageset/Contents.json
deleted file mode 100644
index 9f598a515..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/bullet-list.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "bullet-list.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/composer/bullet-list.imageset/bullet-list.svg b/ElementX/Resources/Assets.xcassets/images/composer/bullet-list.imageset/bullet-list.svg
deleted file mode 100644
index 337ce92dd..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/bullet-list.imageset/bullet-list.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/code-block.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/code-block.imageset/Contents.json
deleted file mode 100644
index d45424dd2..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/code-block.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "code-block.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/composer/code-block.imageset/code-block.svg b/ElementX/Resources/Assets.xcassets/images/composer/code-block.imageset/code-block.svg
deleted file mode 100644
index 2d2e5d580..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/code-block.imageset/code-block.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/editing.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/editing.imageset/Contents.json
deleted file mode 100644
index 7ab1bfca0..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/editing.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "edit-solid-16.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/composer/editing.imageset/edit-solid-16.svg b/ElementX/Resources/Assets.xcassets/images/composer/editing.imageset/edit-solid-16.svg
deleted file mode 100644
index bd11171a4..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/editing.imageset/edit-solid-16.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/indent.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/indent.imageset/Contents.json
deleted file mode 100644
index e9c7e57a5..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/indent.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "indent.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/composer/indent.imageset/indent.svg b/ElementX/Resources/Assets.xcassets/images/composer/indent.imageset/indent.svg
deleted file mode 100644
index 37ea16685..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/indent.imageset/indent.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/inline-code.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/inline-code.imageset/Contents.json
deleted file mode 100644
index 34decd88d..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/inline-code.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "inline-code.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/composer/inline-code.imageset/inline-code.svg b/ElementX/Resources/Assets.xcassets/images/composer/inline-code.imageset/inline-code.svg
deleted file mode 100644
index 8675b7ec9..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/inline-code.imageset/inline-code.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/italic.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/italic.imageset/Contents.json
deleted file mode 100644
index 13001e031..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/italic.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "italic.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/composer/italic.imageset/italic.svg b/ElementX/Resources/Assets.xcassets/images/composer/italic.imageset/italic.svg
deleted file mode 100644
index 542e8ff20..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/italic.imageset/italic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/link.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/link.imageset/Contents.json
deleted file mode 100644
index c161e59a3..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/link.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "link.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/composer/link.imageset/link.svg b/ElementX/Resources/Assets.xcassets/images/composer/link.imageset/link.svg
deleted file mode 100644
index e518c326d..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/link.imageset/link.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/numbered-list.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/numbered-list.imageset/Contents.json
deleted file mode 100644
index 9cb9874fb..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/numbered-list.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "numbered-list.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/composer/numbered-list.imageset/numbered-list.svg b/ElementX/Resources/Assets.xcassets/images/composer/numbered-list.imageset/numbered-list.svg
deleted file mode 100644
index 3179ab800..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/numbered-list.imageset/numbered-list.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/quote.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/quote.imageset/Contents.json
deleted file mode 100644
index 29024dfb4..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/quote.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "quote.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/composer/quote.imageset/quote.svg b/ElementX/Resources/Assets.xcassets/images/composer/quote.imageset/quote.svg
deleted file mode 100644
index 9b14f3fe1..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/quote.imageset/quote.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/send-message.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/send-message.imageset/Contents.json
deleted file mode 100644
index a88d70f2b..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/send-message.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "send.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/composer/send-message.imageset/send.svg b/ElementX/Resources/Assets.xcassets/images/composer/send-message.imageset/send.svg
deleted file mode 100644
index 1e7f3cc28..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/send-message.imageset/send.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/strikethrough.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/strikethrough.imageset/Contents.json
deleted file mode 100644
index 53fed1191..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/strikethrough.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "strikethrough.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/composer/strikethrough.imageset/strikethrough.svg b/ElementX/Resources/Assets.xcassets/images/composer/strikethrough.imageset/strikethrough.svg
deleted file mode 100644
index 7c92f45be..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/strikethrough.imageset/strikethrough.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/text-format.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/text-format.imageset/Contents.json
deleted file mode 100644
index 5d93da13c..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/text-format.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "text-format.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/composer/text-format.imageset/text-format.svg b/ElementX/Resources/Assets.xcassets/images/composer/text-format.imageset/text-format.svg
deleted file mode 100644
index 9a5fc49f2..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/text-format.imageset/text-format.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/underline.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/underline.imageset/Contents.json
deleted file mode 100644
index 188def976..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/underline.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "underline.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/composer/underline.imageset/underline.svg b/ElementX/Resources/Assets.xcassets/images/composer/underline.imageset/underline.svg
deleted file mode 100644
index 194f00271..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/underline.imageset/underline.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/composer/unindent.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/composer/unindent.imageset/Contents.json
deleted file mode 100644
index 239878fba..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/unindent.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "unindent.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/composer/unindent.imageset/unindent.svg b/ElementX/Resources/Assets.xcassets/images/composer/unindent.imageset/unindent.svg
deleted file mode 100644
index 5a090fdb9..000000000
--- a/ElementX/Resources/Assets.xcassets/images/composer/unindent.imageset/unindent.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/devices.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/devices.imageset/Contents.json
deleted file mode 100644
index b4f923dea..000000000
--- a/ElementX/Resources/Assets.xcassets/images/devices.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "devices.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/devices.imageset/devices.svg b/ElementX/Resources/Assets.xcassets/images/devices.imageset/devices.svg
deleted file mode 100644
index b698ba464..000000000
--- a/ElementX/Resources/Assets.xcassets/images/devices.imageset/devices.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/document.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/document.imageset/Contents.json
deleted file mode 100644
index 52a00ccc6..000000000
--- a/ElementX/Resources/Assets.xcassets/images/document.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "document.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/document.imageset/document.svg b/ElementX/Resources/Assets.xcassets/images/document.imageset/document.svg
deleted file mode 100644
index 045f1704e..000000000
--- a/ElementX/Resources/Assets.xcassets/images/document.imageset/document.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/encryption/Contents.json b/ElementX/Resources/Assets.xcassets/images/encryption/Contents.json
deleted file mode 100644
index 73c00596a..000000000
--- a/ElementX/Resources/Assets.xcassets/images/encryption/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
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
deleted file mode 100644
index 2da9ba02c..000000000
--- a/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "waiting-to-decrypt.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/encryption/decryption-error.imageset/waiting-to-decrypt.svg b/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/waiting-to-decrypt.svg
deleted file mode 100644
index 65a508f67..000000000
--- a/ElementX/Resources/Assets.xcassets/images/encryption/decryption-error.imageset/waiting-to-decrypt.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/Contents.json
deleted file mode 100644
index ec08532ca..000000000
--- a/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "sign-out.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/home/sign-out.imageset/sign-out.svg b/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/sign-out.svg
deleted file mode 100644
index 334b95320..000000000
--- a/ElementX/Resources/Assets.xcassets/images/home/sign-out.imageset/sign-out.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/Contents.json
deleted file mode 100644
index 6e860a488..000000000
--- a/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "location-navigator-centred.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/location/location-navigator-centred.imageset/location-navigator-centred.svg b/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/location-navigator-centred.svg
deleted file mode 100644
index 45c3f750f..000000000
--- a/ElementX/Resources/Assets.xcassets/images/location/location-navigator-centred.imageset/location-navigator-centred.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/Contents.json
deleted file mode 100644
index d1138ec18..000000000
--- a/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "location-navigator.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/location/location-navigator.imageset/location-navigator.svg b/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/location-navigator.svg
deleted file mode 100644
index 6f9b0e1c9..000000000
--- a/ElementX/Resources/Assets.xcassets/images/location/location-navigator.imageset/location-navigator.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/Contents.json
deleted file mode 100644
index 2b2a3a6d2..000000000
--- a/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "location-pin-solid.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/location/location-pin-solid.imageset/location-pin-solid.svg b/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/location-pin-solid.svg
deleted file mode 100644
index b8e239088..000000000
--- a/ElementX/Resources/Assets.xcassets/images/location/location-pin-solid.imageset/location-pin-solid.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/lock.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/lock.imageset/Contents.json
deleted file mode 100644
index c534a82ed..000000000
--- a/ElementX/Resources/Assets.xcassets/images/lock.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "lock.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/lock.imageset/lock.svg b/ElementX/Resources/Assets.xcassets/images/lock.imageset/lock.svg
deleted file mode 100644
index 21e6ce2ff..000000000
--- a/ElementX/Resources/Assets.xcassets/images/lock.imageset/lock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/polls-end.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/polls-end.imageset/Contents.json
deleted file mode 100644
index 0931b1a41..000000000
--- a/ElementX/Resources/Assets.xcassets/images/polls-end.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "polls-end.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/polls-end.imageset/polls-end.svg b/ElementX/Resources/Assets.xcassets/images/polls-end.imageset/polls-end.svg
deleted file mode 100644
index 4239cce08..000000000
--- a/ElementX/Resources/Assets.xcassets/images/polls-end.imageset/polls-end.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/polls.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/polls.imageset/Contents.json
deleted file mode 100644
index ed58300ae..000000000
--- a/ElementX/Resources/Assets.xcassets/images/polls.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "polls.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/polls.imageset/polls.svg b/ElementX/Resources/Assets.xcassets/images/polls.imageset/polls.svg
deleted file mode 100644
index 77508c037..000000000
--- a/ElementX/Resources/Assets.xcassets/images/polls.imageset/polls.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/secure-backup/Contents.json b/ElementX/Resources/Assets.xcassets/images/secure-backup/Contents.json
deleted file mode 100644
index 73c00596a..000000000
--- a/ElementX/Resources/Assets.xcassets/images/secure-backup/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-icon.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-icon.imageset/Contents.json
deleted file mode 100644
index 74023a195..000000000
--- a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-icon.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "secure-backup-icon.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/secure-backup/secure-backup-icon.imageset/secure-backup-icon.svg b/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-icon.imageset/secure-backup-icon.svg
deleted file mode 100644
index 88dc86847..000000000
--- a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-icon.imageset/secure-backup-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-off.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-off.imageset/Contents.json
deleted file mode 100644
index 4d670b9a6..000000000
--- a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-off.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "secure-backup-off.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/secure-backup/secure-backup-off.imageset/secure-backup-off.svg b/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-off.imageset/secure-backup-off.svg
deleted file mode 100644
index e6e398d3f..000000000
--- a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-off.imageset/secure-backup-off.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-on.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-on.imageset/Contents.json
deleted file mode 100644
index 975c4f5da..000000000
--- a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-on.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "secure-backup-on.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/secure-backup/secure-backup-on.imageset/secure-backup-on.svg b/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-on.imageset/secure-backup-on.svg
deleted file mode 100644
index 51c360122..000000000
--- a/ElementX/Resources/Assets.xcassets/images/secure-backup/secure-backup-on.imageset/secure-backup-on.svg
+++ /dev/null
@@ -1,3 +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
deleted file mode 100644
index 51dd0ba5c..000000000
--- a/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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
deleted file mode 100644
index bf7a17548..000000000
--- a/ElementX/Resources/Assets.xcassets/images/share-ios.imageset/share-ios.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/Contents.json
deleted file mode 100644
index 73c00596a..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/actions/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/actions/Contents.json
deleted file mode 100644
index 73c00596a..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/actions/add-reaction.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/actions/add-reaction.imageset/Contents.json
deleted file mode 100644
index 2fffbaaa7..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/add-reaction.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "add-reaction.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/timeline/actions/add-reaction.imageset/add-reaction.svg b/ElementX/Resources/Assets.xcassets/images/timeline/actions/add-reaction.imageset/add-reaction.svg
deleted file mode 100644
index 588b3a181..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/add-reaction.imageset/add-reaction.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/actions/copy.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/actions/copy.imageset/Contents.json
deleted file mode 100644
index 01b166d2a..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/copy.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "copy.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/timeline/actions/copy.imageset/copy.svg b/ElementX/Resources/Assets.xcassets/images/timeline/actions/copy.imageset/copy.svg
deleted file mode 100644
index 6f8178ac0..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/copy.imageset/copy.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/actions/edit-outline.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/actions/edit-outline.imageset/Contents.json
deleted file mode 100644
index 319ffd8fa..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/edit-outline.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "edit-outline.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/timeline/actions/edit-outline.imageset/edit-outline.svg b/ElementX/Resources/Assets.xcassets/images/timeline/actions/edit-outline.imageset/edit-outline.svg
deleted file mode 100644
index c96b4deee..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/edit-outline.imageset/edit-outline.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/actions/forward.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/actions/forward.imageset/Contents.json
deleted file mode 100644
index 0f6df7e69..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/forward.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "forward.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/timeline/actions/forward.imageset/forward.svg b/ElementX/Resources/Assets.xcassets/images/timeline/actions/forward.imageset/forward.svg
deleted file mode 100644
index a404e060e..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/forward.imageset/forward.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/actions/reply.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/actions/reply.imageset/Contents.json
deleted file mode 100644
index 63e414c95..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/reply.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "reply.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/timeline/actions/reply.imageset/reply.svg b/ElementX/Resources/Assets.xcassets/images/timeline/actions/reply.imageset/reply.svg
deleted file mode 100644
index 757fefc4b..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/reply.imageset/reply.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/timeline/actions/view-source.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/timeline/actions/view-source.imageset/Contents.json
deleted file mode 100644
index 6b23b46c5..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/view-source.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "view-source.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/timeline/actions/view-source.imageset/view-source.svg b/ElementX/Resources/Assets.xcassets/images/timeline/actions/view-source.imageset/view-source.svg
deleted file mode 100644
index c4e1f52ce..000000000
--- a/ElementX/Resources/Assets.xcassets/images/timeline/actions/view-source.imageset/view-source.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/user-add.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/user-add.imageset/Contents.json
deleted file mode 100644
index d081a83ce..000000000
--- a/ElementX/Resources/Assets.xcassets/images/user-add.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "user-add.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/user-add.imageset/user-add.svg b/ElementX/Resources/Assets.xcassets/images/user-add.imageset/user-add.svg
deleted file mode 100644
index 46b7f8b1b..000000000
--- a/ElementX/Resources/Assets.xcassets/images/user-add.imageset/user-add.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/ElementX/Resources/Assets.xcassets/images/user.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/user.imageset/Contents.json
deleted file mode 100644
index f802e6ce3..000000000
--- a/ElementX/Resources/Assets.xcassets/images/user.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "images" : [
- {
- "filename" : "user.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/user.imageset/user.svg b/ElementX/Resources/Assets.xcassets/images/user.imageset/user.svg
deleted file mode 100644
index 1023dfa17..000000000
--- a/ElementX/Resources/Assets.xcassets/images/user.imageset/user.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift
index 1b147f690..aebca381e 100644
--- a/ElementX/Sources/Generated/Assets.swift
+++ b/ElementX/Sources/Generated/Assets.swift
@@ -33,57 +33,14 @@ 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 block = ImageAsset(name: "images/block")
- 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 takePhoto = ImageAsset(name: "images/take-photo")
- internal static let bold = ImageAsset(name: "images/bold")
- internal static let bulletList = ImageAsset(name: "images/bullet-list")
internal static let closeRte = ImageAsset(name: "images/close-rte")
- internal static let codeBlock = ImageAsset(name: "images/code-block")
internal static let composerAttachment = ImageAsset(name: "images/composer-attachment")
- internal static let editing = ImageAsset(name: "images/editing")
- internal static let indent = ImageAsset(name: "images/indent")
- internal static let inlineCode = ImageAsset(name: "images/inline-code")
- internal static let italic = ImageAsset(name: "images/italic")
- internal static let link = ImageAsset(name: "images/link")
- internal static let numberedList = ImageAsset(name: "images/numbered-list")
- internal static let quote = ImageAsset(name: "images/quote")
- internal static let sendMessage = ImageAsset(name: "images/send-message")
internal static let stopRecording = ImageAsset(name: "images/stop-recording")
- internal static let strikethrough = ImageAsset(name: "images/strikethrough")
- 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 devices = ImageAsset(name: "images/devices")
- internal static let document = ImageAsset(name: "images/document")
- internal static let decryptionError = ImageAsset(name: "images/decryption-error")
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 locationMarkerShape = ImageAsset(name: "images/location-marker-shape")
- internal static let locationNavigatorCentred = ImageAsset(name: "images/location-navigator-centred")
- internal static let locationNavigator = ImageAsset(name: "images/location-navigator")
- internal static let locationPinSolid = ImageAsset(name: "images/location-pin-solid")
- internal static let lock = ImageAsset(name: "images/lock")
internal static let mediaPause = ImageAsset(name: "images/media-pause")
internal static let mediaPlay = ImageAsset(name: "images/media-play")
- internal static let pollsEnd = ImageAsset(name: "images/polls-end")
- internal static let polls = ImageAsset(name: "images/polls")
- 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")
- internal static let forward = ImageAsset(name: "images/forward")
- internal static let reply = ImageAsset(name: "images/reply")
- internal static let viewSource = ImageAsset(name: "images/view-source")
- internal static let userAdd = ImageAsset(name: "images/user-add")
- internal static let user = ImageAsset(name: "images/user")
internal static let waitingGradient = ImageAsset(name: "images/waiting-gradient")
}
}
diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
index 81ef995ed..3acc029a8 100644
--- a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+++ b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -1,4 +1,4 @@
-// Generated using Sourcery 2.1.3 — https://github.com/krzysztofzablocki/Sourcery
+// Generated using Sourcery 2.1.4 — https://github.com/krzysztofzablocki/Sourcery
// DO NOT EDIT
// swiftlint:disable all
diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
index 3984b1821..64baacac8 100644
--- a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
+++ b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
@@ -44,7 +44,7 @@ struct FormButtonStyles_Previews: PreviewProvider, TestablePreview {
Form {
Section { } header: {
Button { } label: {
- CompoundIcon(asset: Asset.Images.shareIos)
+ CompoundIcon(\.shareIos)
}
.buttonStyle(FormActionButtonStyle(title: "Share"))
}
diff --git a/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift b/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift
index 5f6155317..54154e453 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift
@@ -14,28 +14,44 @@
// limitations under the License.
//
+import Compound
import SwiftUI
-/// An image that is styled for use as the main/top/hero screen icon.
+/// An image that is styled for use as the main/top/hero screen icon. This component
+/// takes a compound icon. If you would like to apply it to an SFSymbol, you can call
+/// the `heroImage()` modifier directly on the Image.
struct HeroImage: View {
/// The icon that is shown.
- let image: Image
- /// The amount of padding between the icon and the borders. Defaults to 16.
- var insets: CGFloat = 16
+ let icon: KeyPath
var body: some View {
- image
- .resizable()
+ CompoundIcon(icon, size: .custom(42), relativeTo: .title)
+ .modifier(HeroImageModifier())
+ }
+}
+
+extension Image {
+ /// Styles the image for use as the main/top/hero screen icon. You should prefer
+ /// the HeroImage component when possible, by using an icon from Compound.
+ func heroImage(insets: CGFloat = 16) -> some View {
+ resizable()
.renderingMode(.template)
- .foregroundColor(.compound.iconSecondary)
.aspectRatio(contentMode: .fit)
- .accessibilityHidden(true)
- .padding(insets)
- .frame(width: 70, height: 70)
+ .scaledPadding(insets, relativeTo: .title)
+ .modifier(HeroImageModifier())
+ }
+}
+
+private struct HeroImageModifier: ViewModifier {
+ func body(content: Content) -> some View {
+ content
+ .foregroundColor(.compound.iconPrimary)
+ .scaledFrame(size: 70, relativeTo: .title)
.background {
RoundedRectangle(cornerRadius: 14)
.fill(Color.compound.bgSubtleSecondary)
}
+ .accessibilityHidden(true)
}
}
@@ -44,8 +60,11 @@ struct HeroImage: View {
struct HeroImage_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
HStack(spacing: 20) {
- HeroImage(image: Image(asset: Asset.Images.serverSelectionIcon), insets: 19)
- HeroImage(image: Image(systemName: "hourglass"))
+ HeroImage(icon: \.lockSolid)
+ Image(systemName: "hourglass")
+ .heroImage()
+ Image(asset: Asset.Images.serverSelectionIcon)
+ .heroImage(insets: 19)
}
}
}
diff --git a/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift b/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift
index 8cdee6199..b485a2667 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift
@@ -33,7 +33,7 @@ struct LocationMarkerView: View {
}
var mapMarker: some View {
- CompoundIcon(asset: Asset.Images.locationPinSolid)
+ CompoundIcon(\.locationPinSolid)
.dynamicTypeSize(.large)
.foregroundStyle(pinColor)
.padding(pinInsets)
@@ -47,7 +47,7 @@ struct LocationMarkerView: View {
}
var buttonMarker: some View {
- CompoundIcon(asset: Asset.Images.locationPinSolid, size: .custom(13), relativeTo: .body)
+ CompoundIcon(\.locationPinSolid, size: .custom(13), relativeTo: .body)
.foregroundStyle(pinColor)
.scaledPadding(.top, pinInsets.top * buttonScale)
.scaledPadding(.bottom, pinInsets.bottom * buttonScale)
diff --git a/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift b/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift
index 12bde95cf..484bf4ac8 100644
--- a/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift
+++ b/ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift
@@ -42,8 +42,7 @@ struct AnalyticsPromptScreen: View {
private var header: some View {
VStack(spacing: 8) {
- HeroImage(image: Image(systemName: "chart.bar"))
- .symbolVariant(.fill)
+ HeroImage(icon: \.chart)
.padding(.bottom, 8)
Text(L10n.screenAnalyticsPromptTitle(InfoPlistReader.main.bundleDisplayName))
diff --git a/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift b/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift
index c4b1ba7b6..381afcaae 100644
--- a/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift
+++ b/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift
@@ -66,7 +66,7 @@ struct AppLockScreen: View {
var header: some View {
VStack(spacing: 8) {
- CompoundIcon(\.lock, size: .medium, relativeTo: .compound.headingMDBold)
+ CompoundIcon(\.lockSolid, size: .medium, relativeTo: .compound.headingMDBold)
.padding(.bottom, 8)
.accessibilityHidden(true)
diff --git a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift
index 6be416dbc..826815de6 100644
--- a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift
+++ b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift
@@ -60,8 +60,7 @@ struct AppLockSetupPINScreen: View {
var header: some View {
VStack(spacing: 8) {
- HeroImage(image: Image(systemSymbol: .lock))
- .symbolVariant(.fill)
+ HeroImage(icon: \.lockSolid)
.padding(.bottom, 8)
Text(context.viewState.title)
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
index 2fe9def5d..f4d9d38d5 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
@@ -52,7 +52,7 @@ struct LoginScreen: View {
/// The header containing the title and icon.
var header: some View {
VStack(spacing: 8) {
- HeroImage(image: Image(systemName: "lock.fill"))
+ HeroImage(icon: \.lockSolid)
.padding(.bottom, 8)
Text(L10n.screenLoginTitleWithHomeserver(context.viewState.homeserver.address))
diff --git a/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift b/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift
index 52edef317..3dbcf00c8 100644
--- a/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift
@@ -35,7 +35,8 @@ struct ServerConfirmationScreen: View {
/// The main content of the view to be shown in a scroll view.
var header: some View {
VStack(spacing: 8) {
- HeroImage(image: Image(systemName: "person.crop.circle.fill"))
+ Image(systemSymbol: .personCropCircleFill)
+ .heroImage()
.padding(.bottom, 8)
Text(context.viewState.title)
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift b/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift
index fd351b8be..934cc06aa 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift
@@ -40,7 +40,8 @@ struct ServerSelectionScreen: View {
/// The title, message and icon at the top of the screen.
var header: some View {
VStack(spacing: 8) {
- HeroImage(image: Image(asset: Asset.Images.serverSelectionIcon), insets: 19)
+ Image(asset: Asset.Images.serverSelectionIcon)
+ .heroImage(insets: 19)
.padding(.bottom, 8)
Text(L10n.screenChangeServerTitle)
diff --git a/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift b/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift
index de4b2aaaf..7cb4eaf80 100644
--- a/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift
+++ b/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift
@@ -109,7 +109,11 @@ struct BugReportScreen: View {
.accessibilityIdentifier(A11yIdentifiers.bugReportScreen.screenshot)
.overlay(alignment: .topTrailing) {
Button { context.send(viewAction: .removeScreenshot) } label: {
- Image(Asset.Images.closeCircle.name)
+ CompoundIcon(\.close, size: .small, relativeTo: .compound.bodyMD)
+ .foregroundStyle(.compound.iconSecondary)
+ .background {
+ Circle().fill(.compound.bgCanvasDefaultLevel1)
+ }
}
.offset(x: 10, y: -10)
.accessibilityIdentifier(A11yIdentifiers.bugReportScreen.removeScreenshot)
diff --git a/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarModels.swift b/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarModels.swift
index 372d80149..182ce766d 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarModels.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarModels.swift
@@ -14,8 +14,8 @@
// limitations under the License.
//
+import Compound
import SwiftUI
-import UIKit
import WysiwygComposer
enum ComposerToolbarVoiceMessageAction {
@@ -152,32 +152,32 @@ extension FormatItem: Identifiable {
extension FormatItem {
/// The icon to display in the formatting toolbar.
- var icon: Image {
+ var icon: KeyPath {
switch type {
case .bold:
- return Image(asset: Asset.Images.bold)
+ return \.bold
case .italic:
- return Image(asset: Asset.Images.italic)
+ return \.italic
case .underline:
- return Image(asset: Asset.Images.underline)
+ return \.underline
case .strikeThrough:
- return Image(asset: Asset.Images.strikethrough)
+ return \.strikethrough
case .unorderedList:
- return Image(asset: Asset.Images.bulletList)
+ return \.listBulleted
case .orderedList:
- return Image(asset: Asset.Images.numberedList)
+ return \.listNumbered
case .indent:
- return Image(asset: Asset.Images.indent)
+ return \.indentIncrease
case .unindent:
- return Image(asset: Asset.Images.unindent)
+ return \.indentDecrease
case .inlineCode:
- return Image(asset: Asset.Images.inlineCode)
+ return \.inlineCode
case .codeBlock:
- return Image(asset: Asset.Images.codeBlock)
+ return \.code
case .quote:
- return Image(asset: Asset.Images.quote)
+ return \.quote
case .link:
- return Image(asset: Asset.Images.link)
+ return \.link
}
}
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift b/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift
index 569340dcf..96ba61f97 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift
@@ -147,9 +147,9 @@ struct ComposerToolbar: View {
Button {
context.send(viewAction: .sendMessage)
} label: {
- submitButtonImage
- .symbolVariant(.fill)
- .font(.compound.bodyLG)
+ CompoundIcon(context.viewState.composerMode.isEdit ? \.check : \.sendSolid)
+ .scaledPadding(6, relativeTo: .title)
+ .accessibilityLabel(context.viewState.composerMode.isEdit ? L10n.actionConfirm : L10n.actionSend)
.foregroundColor(context.viewState.sendButtonDisabled ? .compound.iconDisabled : .white)
.background {
Circle()
@@ -214,26 +214,6 @@ struct ComposerToolbar: View {
}
}
- private var submitButtonImage: some View {
- // ZStack with opacity so the button size is consistent.
- ZStack {
- CompoundIcon(\.check)
- .opacity(context.viewState.composerMode.isEdit ? 1 : 0)
- .accessibilityLabel(L10n.actionConfirm)
- .accessibilityHidden(!context.viewState.composerMode.isEdit)
-
- let sendImageOffset: CGFloat = 1
- Image(asset: Asset.Images.sendMessage)
- .resizable()
- .scaledToFit()
- .scaledFrame(width: 16 + sendImageOffset, height: 16, alignment: .trailing, relativeTo: .title)
- .scaledPadding(10, relativeTo: .title)
- .opacity(context.viewState.composerMode.isEdit ? 0 : 1)
- .accessibilityLabel(L10n.actionSend)
- .accessibilityHidden(context.viewState.composerMode.isEdit)
- }
- }
-
private class ItemProviderHelper: WysiwygItemProviderHelper {
func isPasteSupported(for itemProvider: NSItemProvider) -> Bool {
itemProvider.isSupportedForPasteOrDrop
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/FormattingToolbar.swift b/ElementX/Sources/Screens/ComposerToolbar/View/FormattingToolbar.swift
index f251bbc12..8b8dd71f1 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/FormattingToolbar.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/FormattingToolbar.swift
@@ -14,6 +14,7 @@
// limitations under the License.
//
+import Compound
import SwiftUI
struct FormattingToolbar: View {
@@ -29,10 +30,7 @@ struct FormattingToolbar: View {
Button {
formatAction(item.type)
} label: {
- item.icon
- .resizable()
- .scaledToFit()
- .scaledFrame(size: 20)
+ CompoundIcon(item.icon, size: .small, relativeTo: .compound.headingLG)
.foregroundColor(item.foregroundColor)
.padding(8)
.background(item.backgroundColor)
@@ -69,3 +67,15 @@ private extension FormatItem {
}
}
}
+
+struct FormattingToolbar_Previews: PreviewProvider, TestablePreview {
+ static let items = FormatType.allCases.map { FormatItem(type: $0, state: .enabled) }
+ static let disabledItems = FormatType.allCases.map { FormatItem(type: $0, state: .disabled) }
+
+ static var previews: some View {
+ VStack {
+ FormattingToolbar(formatItems: items) { _ in }
+ FormattingToolbar(formatItems: disabledItems) { _ in }
+ }
+ }
+}
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift b/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
index 2a4e97a07..75dc827e2 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
@@ -154,7 +154,7 @@ private struct MessageComposerEditHeader: View {
var body: some View {
HStack(alignment: .center, spacing: 8) {
Label(L10n.commonEditing,
- iconAsset: Asset.Images.editing,
+ icon: \.editSolid,
iconSize: .xSmall,
relativeTo: .compound.bodySMSemibold)
.labelStyle(MessageComposerHeaderLabelStyle())
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift b/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift
index 2433643ec..8c16af666 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/RoomAttachmentPicker.swift
@@ -48,7 +48,7 @@ struct RoomAttachmentPicker: View {
Button {
context.send(viewAction: .attach(.file))
} label: {
- Label(L10n.screenRoomAttachmentSourceFiles, iconAsset: Asset.Images.attachment)
+ Label(L10n.screenRoomAttachmentSourceFiles, icon: \.attachment)
.labelStyle(.menuSheet)
}
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerDocuments)
@@ -56,7 +56,7 @@ struct RoomAttachmentPicker: View {
Button {
context.send(viewAction: .attach(.camera))
} label: {
- Label(L10n.screenRoomAttachmentSourceCamera, iconAsset: Asset.Images.takePhoto)
+ Label(L10n.screenRoomAttachmentSourceCamera, icon: \.takePhoto)
.labelStyle(.menuSheet)
}
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerCamera)
@@ -64,7 +64,7 @@ struct RoomAttachmentPicker: View {
Button {
context.send(viewAction: .attach(.location))
} label: {
- Label(L10n.screenRoomAttachmentSourceLocation, iconAsset: Asset.Images.addLocation)
+ Label(L10n.screenRoomAttachmentSourceLocation, icon: \.locationPin)
.labelStyle(.menuSheet)
}
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerLocation)
@@ -72,7 +72,7 @@ struct RoomAttachmentPicker: View {
Button {
context.send(viewAction: .attach(.poll))
} label: {
- Label(L10n.screenRoomAttachmentSourcePoll, iconAsset: Asset.Images.polls)
+ Label(L10n.screenRoomAttachmentSourcePoll, icon: \.polls)
.labelStyle(.menuSheet)
}
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPoll)
@@ -81,7 +81,7 @@ struct RoomAttachmentPicker: View {
Button {
context.send(viewAction: .enableTextFormatting)
} label: {
- Label(L10n.screenRoomAttachmentTextFormatting, iconAsset: Asset.Images.textFormat)
+ Label(L10n.screenRoomAttachmentTextFormatting, icon: \.textFormatting)
.labelStyle(.menuSheet)
}
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerTextFormatting)
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift
index f9a75f2af..3715fb170 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift
@@ -41,7 +41,7 @@ struct VoiceMessageRecordingButton: View {
} label: {
switch mode {
case .idle:
- CompoundIcon(\.micOnOutline, size: .medium, relativeTo: .title)
+ CompoundIcon(\.micOn, size: .medium, relativeTo: .title)
.foregroundColor(.compound.iconSecondary)
.scaledPadding(10, relativeTo: .title)
case .recording:
diff --git a/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift b/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
index 1461b091b..e22418dd2 100644
--- a/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
+++ b/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
@@ -84,7 +84,7 @@ struct CreateRoomScreen: View {
.scaledFrame(size: 70)
.clipShape(Circle())
} else {
- CompoundIcon(asset: Asset.Images.takePhoto, size: .custom(36), relativeTo: .title)
+ CompoundIcon(\.takePhoto, size: .custom(36), relativeTo: .title)
.foregroundColor(.compound.iconSecondary)
.scaledFrame(size: 70, relativeTo: .title)
.background(.compound.bgSubtlePrimary, in: Circle())
@@ -146,7 +146,7 @@ struct CreateRoomScreen: View {
Section {
ListRow(label: .default(title: L10n.screenCreateRoomPrivateOptionTitle,
description: L10n.screenCreateRoomPrivateOptionDescription,
- icon: CompoundIcon(asset: Asset.Images.lock),
+ icon: \.lock,
iconAlignment: .top),
kind: .selection(isSelected: context.isRoomPrivate) { context.isRoomPrivate = true })
ListRow(label: .default(title: L10n.screenCreateRoomPublicOptionTitle,
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
index 49732d6cd..d0be91813 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
@@ -159,7 +159,7 @@ struct HomeScreen: View {
Button {
context.send(viewAction: .startChat)
} label: {
- CompoundIcon(\.edit)
+ CompoundIcon(\.compose)
}
.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 ddf791d26..385a6c7b2 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, icon: \.edit)
+ Label(L10n.actionStartChat, icon: \.compose)
.font(.compound.bodyLGSemibold)
.foregroundColor(.compound.textOnSolidPrimary)
.padding(.vertical, 6)
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
index 3420d6af7..4447307be 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
@@ -123,7 +123,7 @@ struct HomeScreenRoomCell: View {
}
if room.notificationMode == .mute {
- CompoundIcon(\.notificationsSolidOff, size: .custom(15), relativeTo: .compound.bodyMD)
+ CompoundIcon(\.notificationsOffSolid, size: .custom(15), relativeTo: .compound.bodyMD)
.accessibilityLabel(L10n.a11yNotificationsMuted)
.foregroundColor(.compound.iconQuaternary)
}
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift
index c126792ca..5d67b59c8 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenUserMenuButton.swift
@@ -40,7 +40,7 @@ struct HomeScreenUserMenuButton: View {
Button(role: .destructive) {
context.send(viewAction: .userMenu(action: .logout))
} label: {
- Label(L10n.screenSignoutPreferenceItem, iconAsset: Asset.Images.signOut)
+ Label(L10n.screenSignoutPreferenceItem, icon: \.signOut)
}
}
} label: {
diff --git a/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift b/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift
index 9dd9bc3a7..7ea53f75a 100644
--- a/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift
+++ b/ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift
@@ -120,7 +120,7 @@ struct StaticLocationScreen: View {
Button {
context.send(viewAction: .centerToUser)
} label: {
- CompoundIcon(asset: context.viewState.isSharingUserLocation ? Asset.Images.locationNavigatorCentred : Asset.Images.locationNavigator)
+ CompoundIcon(context.viewState.isSharingUserLocation ? \.locationNavigatorCentred : \.locationNavigator)
.padding(8)
.background(.compound.bgCanvasDefault, in: RoundedRectangle(cornerRadius: 6))
}
diff --git a/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift b/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
index 54e0078cd..a7f01ecbb 100644
--- a/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
+++ b/ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
@@ -122,9 +122,9 @@ struct RoomDetailsEditScreen: View {
}
private var avatarOverlayIcon: some View {
- CompoundIcon(asset: Asset.Images.editing, size: .xSmall, relativeTo: .compound.bodyLG)
+ CompoundIcon(\.editSolid, size: .xSmall, relativeTo: .compound.bodyLG)
.foregroundColor(.white)
- .padding(3)
+ .padding(4)
.background {
Circle()
.foregroundColor(.black)
diff --git a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
index b14783707..792e1a9d6 100644
--- a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
+++ b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
@@ -108,7 +108,7 @@ struct RoomDetailsScreen: View {
toggleMuteButton
case .share(let permalink):
ShareLink(item: permalink) {
- CompoundIcon(asset: Asset.Images.shareIos)
+ CompoundIcon(\.shareIos)
}
.buttonStyle(FormActionButtonStyle(title: L10n.actionShare))
}
@@ -150,7 +150,7 @@ struct RoomDetailsScreen: View {
Section {
if context.viewState.dmRecipient == nil {
ListRow(label: .default(title: L10n.commonPeople,
- icon: CompoundIcon(asset: Asset.Images.user)),
+ icon: \.user),
details: .title(String(context.viewState.joinedMembersCount)),
kind: .navigationLink {
context.send(viewAction: .processTapPeople)
@@ -159,7 +159,7 @@ struct RoomDetailsScreen: View {
if context.viewState.canInviteUsers {
ListRow(label: .default(title: L10n.screenRoomDetailsInvitePeopleTitle,
- icon: CompoundIcon(asset: Asset.Images.userAdd)),
+ icon: \.userAdd),
kind: .navigationLink {
context.send(viewAction: .processTapInvite)
})
@@ -167,7 +167,7 @@ struct RoomDetailsScreen: View {
}
}
ListRow(label: .default(title: L10n.screenPollsHistoryTitle,
- icon: CompoundIcon(asset: Asset.Images.polls)),
+ icon: \.polls),
kind: .navigationLink {
context.send(viewAction: .processTapPolls)
})
@@ -211,7 +211,7 @@ struct RoomDetailsScreen: View {
Section {
ListRow(label: .default(title: L10n.screenRoomDetailsEncryptionEnabledTitle,
description: L10n.screenRoomDetailsEncryptionEnabledSubtitle,
- icon: CompoundIcon(asset: Asset.Images.lock),
+ icon: \.lock,
iconAlignment: .top),
kind: .label)
} header: {
@@ -237,7 +237,7 @@ struct RoomDetailsScreen: View {
private func ignoreUserSection(user: RoomMemberDetails) -> some View {
Section {
ListRow(label: .default(title: user.isIgnored ? L10n.screenDmDetailsUnblockUser : L10n.screenDmDetailsBlockUser,
- icon: CompoundIcon(asset: Asset.Images.block),
+ icon: \.block,
role: user.isIgnored ? nil : .destructive),
details: .isWaiting(context.viewState.isProcessingIgnoreRequest),
kind: .button {
diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
index 0221efab5..7ba97d466 100644
--- a/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
+++ b/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
@@ -51,7 +51,7 @@ struct RoomMemberDetailsScreen: View {
if let permalink = context.viewState.details.permalink {
HStack(spacing: 32) {
ShareLink(item: permalink) {
- CompoundIcon(asset: Asset.Images.shareIos)
+ CompoundIcon(\.shareIos)
}
.buttonStyle(FormActionButtonStyle(title: L10n.actionShare))
}
@@ -74,7 +74,7 @@ struct RoomMemberDetailsScreen: View {
private var blockUserSection: some View {
Section {
ListRow(label: .default(title: blockUserButtonTitle,
- icon: CompoundIcon(asset: Asset.Images.block),
+ icon: \.block,
role: context.viewState.details.isIgnored ? nil : .destructive),
details: .isWaiting(context.viewState.isProcessingIgnoreRequest),
kind: .button {
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Polls/PollView.swift b/ElementX/Sources/Screens/RoomScreen/View/Polls/PollView.swift
index 13e7664ba..7bd44641c 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Polls/PollView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Polls/PollView.swift
@@ -14,6 +14,7 @@
// limitations under the License.
//
+import Compound
import SwiftUI
enum PollViewAction {
@@ -43,11 +44,9 @@ struct PollView: View {
private var questionView: some View {
HStack(alignment: .top, spacing: 12) {
- let asset = poll.hasEnded ? Asset.Images.pollsEnd : Asset.Images.polls
-
- Image(asset.name)
- .resizable()
- .scaledFrame(size: 22)
+ CompoundIcon(poll.hasEnded ? \.pollsEnd : \.polls,
+ size: .custom(22),
+ relativeTo: .compound.bodyLGSemibold)
.accessibilityHidden(true)
Text(poll.question)
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift b/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
index 0977d3d26..10311f38b 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Replies/TimelineReplyView.swift
@@ -46,7 +46,7 @@ struct TimelineReplyView: View {
ReplyView(sender: sender,
plainBody: content.body,
formattedBody: nil,
- icon: .init(kind: .iconAsset(Asset.Images.document), cornerRadii: iconCornerRadii))
+ icon: .init(kind: .icon(\.document), cornerRadii: iconCornerRadii))
case .image(let content):
ReplyView(sender: sender,
plainBody: content.body,
@@ -69,18 +69,18 @@ struct TimelineReplyView: View {
ReplyView(sender: sender,
plainBody: L10n.commonVoiceMessage,
formattedBody: nil,
- icon: .init(kind: .icon(\.micOnOutline), cornerRadii: iconCornerRadii))
+ icon: .init(kind: .icon(\.micOn), cornerRadii: iconCornerRadii))
case .location:
ReplyView(sender: sender,
plainBody: L10n.commonSharedLocation,
formattedBody: nil,
- icon: .init(kind: .iconAsset(Asset.Images.addLocation), cornerRadii: iconCornerRadii))
+ icon: .init(kind: .icon(\.locationPin), cornerRadii: iconCornerRadii))
}
case .poll(let question):
ReplyView(sender: sender,
plainBody: question,
formattedBody: nil,
- icon: .init(kind: .iconAsset(Asset.Images.polls), cornerRadii: iconCornerRadii))
+ icon: .init(kind: .icon(\.polls), cornerRadii: iconCornerRadii))
}
default:
LoadingReplyView()
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift
index 6053dde18..0c5a2d7fc 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/SwipeToReplyView.swift
@@ -21,7 +21,7 @@ struct SwipeToReplyView: View {
let timelineItem: RoomTimelineItemProtocol
var body: some View {
- CompoundIcon(asset: Asset.Images.reply)
+ CompoundIcon(\.reply)
.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 44e9e5ba4..c4b5add29 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
@@ -28,7 +28,7 @@ struct TimelineDeliveryStatusView: View {
private var icon: CompoundIcon {
switch deliveryStatus {
case .sending:
- return CompoundIcon(asset: Asset.Images.circle, size: .xSmall, relativeTo: .compound.bodyMD)
+ return CompoundIcon(\.circle, size: .xSmall, relativeTo: .compound.bodyMD)
case .sent:
return CompoundIcon(\.checkCircle, size: .xSmall, relativeTo: .compound.bodyMD)
}
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
index cf9445a13..ef87bfb3f 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
@@ -14,6 +14,7 @@
// limitations under the License.
//
+import Compound
import SwiftUI
@MainActor
@@ -191,9 +192,7 @@ struct TimelineReactionButton: View {
struct TimelineReactionAddMoreButtonLabel: View {
var body: some View {
TimelineReactionButtonLabel {
- Image(asset: Asset.Images.addReaction)
- .resizable()
- .scaledFrame(size: 16)
+ CompoundIcon(\.reactionAdd, size: .xSmall, relativeTo: .compound.bodySM)
.padding(.vertical, 8)
.padding(.horizontal, 12)
.foregroundColor(.compound.iconSecondary)
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
index f13b0bd4c..b0ccd7e57 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
@@ -21,7 +21,7 @@ struct EncryptedRoomTimelineView: View {
var body: some View {
TimelineStyler(timelineItem: timelineItem) {
- Label(timelineItem.body, iconAsset: Asset.Images.decryptionError, iconSize: .small, relativeTo: .compound.bodyLG)
+ Label(timelineItem.body, icon: \.time, iconSize: .small, relativeTo: .compound.bodyLG)
.labelStyle(RoomTimelineViewLabelStyle())
.font(.compound.bodyLG)
}
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift
index 0711af012..40f595fc8 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift
@@ -101,27 +101,27 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
var label: some View {
switch self {
case .copy:
- Label(L10n.actionCopy, iconAsset: Asset.Images.copy)
+ Label(L10n.actionCopy, icon: \.copy)
case .edit:
- Label(L10n.actionEdit, iconAsset: Asset.Images.editOutline)
+ Label(L10n.actionEdit, icon: \.edit)
case .copyPermalink:
Label(L10n.actionCopyLinkToMessage, icon: \.link)
case .reply(let isThread):
- Label(isThread ? L10n.actionReplyInThread : L10n.actionReply, iconAsset: Asset.Images.reply)
+ Label(isThread ? L10n.actionReplyInThread : L10n.actionReply, icon: \.reply)
case .forward:
- Label(L10n.actionForward, iconAsset: Asset.Images.forward)
+ Label(L10n.actionForward, icon: \.forward)
case .redact:
Label(L10n.actionRemove, icon: \.delete)
case .viewSource:
- Label(L10n.actionViewSource, iconAsset: Asset.Images.viewSource)
+ Label(L10n.actionViewSource, icon: \.code)
case .retryDecryption:
Label(L10n.actionRetryDecryption, systemImage: "arrow.down.message")
case .report:
Label(L10n.actionReportContent, icon: \.chatProblem)
case .react:
- Label(L10n.actionReact, iconAsset: Asset.Images.addReaction)
+ Label(L10n.actionReact, icon: \.reactionAdd)
case .endPoll:
- Label(L10n.actionEndPoll, iconAsset: Asset.Images.pollsEnd)
+ Label(L10n.actionEndPoll, icon: \.pollsEnd)
}
}
}
@@ -225,10 +225,7 @@ struct TimelineItemMenu: View {
context.send(viewAction: .displayEmojiPicker(itemID: item.id))
}
} label: {
- Image(asset: Asset.Images.addReaction)
- .resizable()
- .scaledFrame(size: 24)
- .frame(maxHeight: .infinity, alignment: .center)
+ CompoundIcon(\.reactionAdd, size: .medium, relativeTo: .compound.headingLG)
.foregroundColor(.compound.iconSecondary)
.padding(10)
}
diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
index 4675e0101..a27e3d632 100644
--- a/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
+++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
@@ -40,7 +40,7 @@ struct SecureBackupKeyBackupScreen: View {
private var disableBackupSection: some View {
VStack(spacing: 16) {
- HeroImage(image: Image(asset: Asset.Images.secureBackupOff))
+ HeroImage(icon: \.keyOffSolid)
Text(L10n.screenKeyBackupDisableTitle)
.foregroundColor(.compound.textPrimary)
diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift
index 7c5dbb638..1e29b4e63 100644
--- a/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift
+++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift
@@ -39,7 +39,7 @@ struct SecureBackupLogoutConfirmationScreen: View {
@ViewBuilder
private var header: some View {
- HeroImage(image: Image(asset: Asset.Images.secureBackupOff))
+ HeroImage(icon: \.keyOffSolid)
}
@ViewBuilder
diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift
index 1a8b171ca..03df0d9ae 100644
--- a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift
+++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift
@@ -106,7 +106,7 @@ struct SecureBackupRecoveryKeyScreen: View {
private var header: some View {
VStack(spacing: 16) {
- HeroImage(image: Image(asset: Asset.Images.secureBackupOn))
+ HeroImage(icon: \.keySolid)
Text(context.viewState.title)
.foregroundColor(.compound.textPrimary)
@@ -143,7 +143,7 @@ struct SecureBackupRecoveryKeyScreen: View {
Button {
context.send(viewAction: .copyKey)
} label: {
- Image(asset: Asset.Images.copy)
+ CompoundIcon(\.copy)
}
.tint(.compound.iconSecondary)
.accessibilityLabel(L10n.actionCopy)
diff --git a/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift b/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift
index 034a39cbb..0d21f5921 100644
--- a/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift
+++ b/ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift
@@ -71,7 +71,8 @@ struct SessionVerificationScreen: View {
@ViewBuilder
private var screenHeader: some View {
VStack(spacing: 0) {
- HeroImage(image: Image(systemName: headerImageName))
+ Image(systemName: headerImageName)
+ .heroImage()
.padding(.bottom, 16)
Text(context.viewState.title ?? "")
diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
index c70f0a154..7d3957d7a 100644
--- a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
@@ -87,7 +87,7 @@ struct SettingsScreen: View {
kind: .button { context.send(viewAction: .sessionVerification) })
} else {
ListRow(label: .default(title: L10n.commonChatBackup,
- icon: Image(asset: Asset.Images.secureBackupIcon)),
+ icon: \.key),
details: context.viewState.showSecureBackupBadge ? .icon(secureBackupBadge) : nil,
kind: .navigationLink { context.send(viewAction: .secureBackup) })
.accessibilityIdentifier(A11yIdentifiers.settingsScreen.secureBackup)
@@ -115,14 +115,14 @@ struct SettingsScreen: View {
.accessibilityIdentifier(A11yIdentifiers.settingsScreen.notifications)
ListRow(label: .default(title: L10n.commonAnalytics,
- icon: \.polls),
+ icon: \.chart),
kind: .navigationLink {
context.send(viewAction: .analytics)
})
.accessibilityIdentifier(A11yIdentifiers.settingsScreen.analytics)
ListRow(label: .default(title: L10n.commonScreenLock,
- icon: CompoundIcon(asset: Asset.Images.lock)),
+ icon: \.lock),
kind: .navigationLink {
context.send(viewAction: .appLock)
})
@@ -147,7 +147,7 @@ struct SettingsScreen: View {
private var manageSessionsSection: some View {
Section {
ListRow(label: .default(title: L10n.actionManageDevices,
- icon: CompoundIcon(asset: Asset.Images.devices)),
+ icon: \.devices),
kind: .button {
context.send(viewAction: .accountSessionsList)
})
@@ -165,7 +165,7 @@ struct SettingsScreen: View {
if context.viewState.showDeveloperOptions {
ListRow(label: .default(title: L10n.commonDeveloperOptions,
- icon: CompoundIcon(asset: Asset.Images.codeBlock)),
+ icon: \.code),
kind: .navigationLink {
context.send(viewAction: .developerOptions)
})
@@ -177,7 +177,7 @@ struct SettingsScreen: View {
private var signOutSection: some View {
Section {
ListRow(label: .action(title: L10n.screenSignoutPreferenceItem,
- icon: CompoundIcon(asset: Asset.Images.signOut),
+ icon: \.signOut,
role: .destructive),
kind: .button {
context.send(viewAction: .logout)
diff --git a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
index 8eeda67f2..852f5e571 100644
--- a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
+++ b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
@@ -89,7 +89,7 @@ struct UserDetailsEditScreen: View {
}
private var avatarOverlayIcon: some View {
- CompoundIcon(asset: Asset.Images.editing, size: .xSmall, relativeTo: .compound.bodyLG)
+ CompoundIcon(\.editSolid, size: .xSmall, relativeTo: .compound.bodyLG)
.foregroundColor(.white)
.padding(4)
.background {
diff --git a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
index f0c9b868c..2d1ca305d 100644
--- a/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
+++ b/ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
@@ -76,7 +76,7 @@ struct StartChatScreen: View {
ListRow(kind: .custom {
MatrixUserShareLink(userID: context.viewState.userID) {
ListRowLabel.default(title: L10n.actionInvitePeopleToApp(InfoPlistReader.main.bundleDisplayName),
- icon: CompoundIcon(asset: Asset.Images.shareIos))
+ icon: \.shareIos)
}
})
.accessibilityIdentifier(A11yIdentifiers.startChatScreen.inviteFriends)
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png
index edc83151e..104208871 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1006b799a2e30f163e9a442e73caad78c49fafe7d80b0668147bfc425fa3ff1b
-size 142737
+oid sha256:dadb1c1c336e0a8a74218bfc0b8d2b6d5e82e02b78489dd7c269ca7be53842db
+size 142673
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png
index 9cdbc795a..86a1c68f3 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d5ed9229cb5607a9cefca50dbee4d3ad91cf2a563c6088d388c7907184454ace
-size 105595
+oid sha256:fc42e53ebad66196b3dac9a0d3be487b064deafa75dd4a76aae6d4bf6b7b9cca
+size 105399
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png
index a0d88c578..425a06b38 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:09722ed927d4708b3c6053c6e8d528f3484a908ee445569bf3e38c5f1007ff1a
-size 105859
+oid sha256:37dc958d49a8f2cf05422d6334566684073d45bcd7bfed775bde0baeb1236bde
+size 105681
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png
index 9a1d937f3..e65274d7c 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4c01d9a9aea76ed7793e772441d4556b76092550c40a1d4c0205d4fc5d71577f
-size 85973
+oid sha256:328561b6398a9933313f2c511b6dbeedb3a32219f5df2f04e5d3f4d758e3e697
+size 85677
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png
index 0ef6ee1a9..aeccc8bc2 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f2c675912f550b5e05abd322db817dde5a1360eaae0d678b0bc8ac5c93f75a97
-size 84354
+oid sha256:992d6bf4555a16f2456a93d46f013c9abf4d817b03d2a90ea3ea8cff4be2a550
+size 84232
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png b/UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png
index d888f98a2..0fbd0473a 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:3702bb587932d15ade8a69fb01eb24a7a8e4603b58b16eec628abca50c069902
-size 274343
+oid sha256:b94605882111cba7524e756db80ed7079f9b4eac1081fbd2d039da5b5065a6de
+size 273812
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png b/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png
index 1f0b9988c..10e09b1b5 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2065404feb1bfb08a9542e7e8606b00e8671f543435562cc0c483ca9e9d5f08e
-size 96287
+oid sha256:0084083fa77c1145a337a0e0b7ee294d68198d0696e318c61384b6293b62f354
+size 95819
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png b/UnitTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png
index 1cd58c695..888ef9277 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ae585f2202e9c1d95cedd195ff1420f6d8d47e8d71f3fbc181e3a54afb113199
-size 68492
+oid sha256:d5279528247aa3a36d693bbf1c191b0246e2f95d7d942637743d0c17d294355e
+size 68532
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formattingToolbar.1.png b/UnitTests/__Snapshots__/PreviewTests/test_formattingToolbar.1.png
new file mode 100644
index 000000000..699f76746
--- /dev/null
+++ b/UnitTests/__Snapshots__/PreviewTests/test_formattingToolbar.1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e53a4aa34fddadb847057b12569da35a3416bede42c26a54bf08b893894e5fdd
+size 66337
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_heroImage.1.png b/UnitTests/__Snapshots__/PreviewTests/test_heroImage.1.png
index d0a2afba2..d806c767e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_heroImage.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_heroImage.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:16702841f53adf7c64d05fdfb9488fd6954ca2b221ce0710edd2d41aadcb4364
-size 64974
+oid sha256:368bda064c7d86f88ecf726b871e573f61ef9a42c9519d224502355f15cc58fc
+size 68830
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png
index 49f364bcd..2416ea107 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:120bd3e64124cc87447c9c852b88c889e733d5de5fdcad086922d61ddc560e9f
-size 104373
+oid sha256:f9624463c0b47319f3dff70fa7d441f3861bb21e6cfccf0af6c5104800cc3c5e
+size 104975
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png
index 6a63b14e0..42b5fe9af 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:46952173e5f97645cb9b2c34b1a137ab29401ae7a4e4f908de04682e4423c249
-size 296881
+oid sha256:3aea35339e59042ebc74a729bf436f68260917dcb5796920b5fc44a10b3188a7
+size 297218
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png
index 3ee722452..cf692f6b8 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:c2ca57c531d847da14ab639cabe6a1eb37e615cf3a28db4749e6c6ca88f26800
-size 151676
+oid sha256:7373efd12a87466ec69cffe176bc9a94576e431d113e7e40e680dda4d51cac96
+size 152744
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png
index a1305474d..c3ef0898e 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:a2dafbdd32b395dd007ba56f506e2bde32f4c9817ed31d11d76067f93c34055f
-size 104560
+oid sha256:3fcaf8f54d2bba75e9d06bf291967d331e43945fdb237b90b49280e390d726d9
+size 105226
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png b/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png
index 3699048d2..c67726423 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:36c15a7c06eeaa93f80de7c125247f729ad994950dff289331248fdafff51a82
-size 79368
+oid sha256:1d2f3cf20c6fdd8b096c38df963ab9b87c4416ce4d9dcae9a4dc64977ab30bb6
+size 79697
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png
index e1debbeac..f8a8bc9b7 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8717376581997f42398e79378722756121e2439a6257d5af16eca6d1bfdd2137
-size 83183
+oid sha256:168fcdfd95bf0e928b3a5894096a394ddd840566cdcc9522f158accde7ceaa66
+size 83323
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
index 6425e5d14..260259be6 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e753bb4e5e15d15db7ad5074477521a8222109668d8c6a3dd542ef1fe553eed3
-size 95450
+oid sha256:9be598e27e87d228019792a02c50a885c0f2db43857ddd7dec406c141e31c5db
+size 95142
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
index 106ceb5ad..8818c7e85 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b0daac359ce0829a4aeaeebad81686a56602326bfad52ee180ac989852b8f362
-size 99790
+oid sha256:572cd5058412cd32df3a4d2ebae7158d3a7f23e67d6aad9f676c120f5dae09cc
+size 99484
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
index 106ceb5ad..8818c7e85 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b0daac359ce0829a4aeaeebad81686a56602326bfad52ee180ac989852b8f362
-size 99790
+oid sha256:572cd5058412cd32df3a4d2ebae7158d3a7f23e67d6aad9f676c120f5dae09cc
+size 99484
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
index 106ceb5ad..8818c7e85 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b0daac359ce0829a4aeaeebad81686a56602326bfad52ee180ac989852b8f362
-size 99790
+oid sha256:572cd5058412cd32df3a4d2ebae7158d3a7f23e67d6aad9f676c120f5dae09cc
+size 99484
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
index 783879580..69ca494b9 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7077f69587c6b118fdec1bdb92f41f1966b521d6e9e953d52d28d62d6e50fc24
-size 90696
+oid sha256:8aab1da7c2b94bc5124ee51c5a1982e3de84a398d2d6c867aaa3aed98a53acd2
+size 90944
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png
index af0e907a8..7a8f89b8f 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:867ea722d971520d4e0e56caa723967cc5bf13d78ba7ca029a576c30a8684e9b
-size 227746
+oid sha256:534f4e3f7d4228befd85a2e925e2da9f003c1425c0c0cb911e41795230a3c82c
+size 227915
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png
index af0e907a8..7a8f89b8f 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:867ea722d971520d4e0e56caa723967cc5bf13d78ba7ca029a576c30a8684e9b
-size 227746
+oid sha256:534f4e3f7d4228befd85a2e925e2da9f003c1425c0c0cb911e41795230a3c82c
+size 227915
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png
index ea36ea48e..424a9c57a 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:25e675352371afe2cb49964625d970dd463a4e53101d5cbaa970a75f1dbc773e
-size 129854
+oid sha256:8603fc2cd8c6f685e9025425c2f6332d28844203ca96e43c2535c689644bfe1e
+size 129840
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
index 08ceeef13..0acf80ba9 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f39754d89bc81580a63e4d329c1c81e29d1d9df7f3e42a3b4d30b960c2a80fb8
-size 121491
+oid sha256:c74de202ad8327c8224db343b47a8cd600dffc1b90558b46e5b21308727764f9
+size 121474
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png
index 435bf5f66..82172ea2d 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:efa03d52e488aab729f3e02dbaa88f09ae1bf8448d2aa67188773dc84375d58e
-size 129422
+oid sha256:315ebee68fd87fe64dea5184c31b7016b28e07b0055eebe13dab9153b99a3f0b
+size 129410
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png
index d2430fc46..635bfba02 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4af9c3f6adb57e5ca8381958121b4339afec8b19f609698eaf27387f26f8569f
-size 121211
+oid sha256:18c97555aada07c456664c61118a781d38a7ad903a50d55bfe5497dd0c0fc980
+size 121186
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png
index 90038ba93..5aff0ed9f 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e43977f425910fe302b04ea4214a68771fac5807ecd9ac49fc643f4c7f9aefe3
-size 123174
+oid sha256:97773ff50e2125372769e63c28184fb96c7bc543bd99d19568052ff86e12d97c
+size 123154
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
index 95f49cc45..7191cf7d0 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d3354293fc84c05fdc8e07ed4a54f368a084464a6046ed1850f113d24b5ea925
-size 114672
+oid sha256:574b311d2ab5e331ce4a602ee2c9ef115f1d179b0c820023325e7320c3c1c823
+size 114641
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png
index 6051ce9b4..4ea6b24d9 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:18f26336e71fb7c29e354b816a34f027e58cd8bb4a9b7a34bccfb0b4cfb0c120
-size 120785
+oid sha256:bf98ed52d55fc9d79991a3cbbe742e5027c23258d79f5a863c0b05c4be7eaa3a
+size 120783
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
index b29cf2271..8835fc763 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fc9dc0e3b57f275b4ead472a06cd01825f0010b937e4329c880dbeb9e8e1fb44
-size 114726
+oid sha256:1b6cc2fff1bb09a1e40825a7a910155a42952d27d43dc83ac8c522fbad4ed3fb
+size 114720
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png
index 6051ce9b4..4ea6b24d9 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:18f26336e71fb7c29e354b816a34f027e58cd8bb4a9b7a34bccfb0b4cfb0c120
-size 120785
+oid sha256:bf98ed52d55fc9d79991a3cbbe742e5027c23258d79f5a863c0b05c4be7eaa3a
+size 120783
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
index b29cf2271..8835fc763 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fc9dc0e3b57f275b4ead472a06cd01825f0010b937e4329c880dbeb9e8e1fb44
-size 114726
+oid sha256:1b6cc2fff1bb09a1e40825a7a910155a42952d27d43dc83ac8c522fbad4ed3fb
+size 114720
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png
index f3ffa6170..13d68e264 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:891489f9abf58ff02f53ae638c5d40267e46349617440354a42761d1483bd34f
-size 117770
+oid sha256:64197640705249b153b568b9e5486e10f332ff2afb4d3d25e989e30eb91aab9e
+size 117755
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
index 2eb1092e5..3dab551ab 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bbf6f02d26e9e18d85b9e97870cfd48678d9cc9233a258d5fc18a9cf4f06a387
-size 109717
+oid sha256:92c1056a5dbfc1f27b581ee899d6370963509ada1ec90dfa7366e64af41ed210
+size 109693
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png
index cf47e2536..da7df1079 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6b0c5b464a748ad0862049a76bb4f187c679034cc28898447c5058c4931789ac
-size 116006
+oid sha256:07785fcf72f39457ac4bc2fb289e5e5b08b79a1186773e2e6bcd990180a11a91
+size 115991
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png
index aa858e5aa..74742e521 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d3e3a08b89f04a344b1eeedd42100ea950063a5cd0bab3eb944fc12f9e19951a
-size 115364
+oid sha256:2ab9138cce95f0330fd6061b262d7d7cbee357bc15ec95e69df9176999f04997
+size 115349
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png
index 2447166cc..041f37f43 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cda1d8f5b00bce67897298cfd4c8f13449c1a4925648845abea59f0b9ad95156
-size 108965
+oid sha256:a306d115e100dea76a2d66d0b7183434a0eb123ae0a9de53f8f509c1eb9b4e2c
+size 108953
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png
index aa2d48dc8..a62752c87 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:72a22c525adf7ae1a33801dea692ce7774d285e8b1c4430167da71709e990c32
-size 109045
+oid sha256:78cdb64a6bac24cd64ad1fe4cfda23805de6ba698678df5b2986956ea1fd98f6
+size 109025
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png
index aa2d48dc8..a62752c87 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:72a22c525adf7ae1a33801dea692ce7774d285e8b1c4430167da71709e990c32
-size 109045
+oid sha256:78cdb64a6bac24cd64ad1fe4cfda23805de6ba698678df5b2986956ea1fd98f6
+size 109025
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png
index 049c8f4a8..bf482f784 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5f8d5def15c593ab91d412d432957ca8fbc73c552dc45d8940d32b6f4d512b02
-size 103783
+oid sha256:89f0492a3a60de22cf1783a98fb99472ddc7ca815f987956f43776651b856e47
+size 103766
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png
index a19a3046e..8ea07ada2 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:d9fd2b7edf2446e90d13a6cdefe89eb2701e9e46d66c21cfad55a5b600f0b990
-size 102675
+oid sha256:0eb00a6f15a6fbdcd5194a376fbf120ab8f27577a55ce779ec81bf6fc3d38894
+size 102815
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
index 27985c748..57dc99019 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3385ad85711489e26d8a7bc8d4951595fbb860f78b894bbdede811b33da4e875
-size 169187
+oid sha256:22c9fb68f3efadf5fa6f6c244e9c3697c1a544d3ab39bc9f93212a98c07971d8
+size 169268
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
index c613cd6ac..3a2b2fd53 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:df5bf3bdc2a327abc5acff85eacf22da2daea56cd87edb20d166bf63ea6c65c5
-size 173146
+oid sha256:a847d4fb1716ef163b5d02cf827334dcfab9bf73e634b693ef29cb0b300f2718
+size 173205
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
index 68c5406e2..ca550a91b 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1d62c100d777596fbec7d9f7d6ad03983f7963bdab029ed231667bdca5db767e
-size 112041
+oid sha256:a4bb8b7b11c4eb0c2aee864d870d8faff2856d52b7758f72aad3948f6b05c948
+size 112105
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
index 34197544b..21fdde30e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dadbed9642ee3ff23df20aa86cf9d90ffe8a629fead453235de93ffac573c7c3
-size 127652
+oid sha256:4aef8cd1ef49b20cbdb7be36c8a8cd5ee18ac43ad0025c76af1b1e4703469277
+size 127697
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
index c3524c552..d35353914 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b664834d021eb811ddaaf392c7dbbf039398ba94bacf4b855d9fb121cf035019
-size 108437
+oid sha256:5ca8b14675431c8e5726ff8fd51fd94ed034806c5e22aebd286dc5e11c562b77
+size 108476
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
index 4eb9ec1fd..7f50ba779 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fc2d8177c1e175c6948e4243f0fb0067a7c6b0ba3e69ab9d3ef1bcbeb7c5d247
-size 148276
+oid sha256:4d14b301dc1a42be0c1795b9a30cc2bfd40bbbbc52e3d2e3abc3a101bf0bc7e4
+size 148346
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png b/UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png
index 75c2a6553..e4daa2a6b 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cf0718060176eba8372ec98d6d2ceddd12a0f25e25bebda7fec9fa0ea904b482
-size 201120
+oid sha256:45c035ebe0805f368d0ab3fc553ddb513ebef6c2f78b5d634c5a4134cc90c434
+size 201083
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_roomScreen.1.png
index 0f3d84ea4..272a32fbb 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomScreen.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:55c81d944ca306394028e296f8682d7921343af7e88c42b269ca3c1a915ef283
-size 311720
+oid sha256:92666244d7c2a27b34509e41af7d960ab61eca3ef0bdbcdb62f4f25dd87adefb
+size 311453
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
index da7753c67..5f9f5e8d6 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9aeeeaddb0f1604d2c2bbe186d17a84d246819d079875e32e4b7680ce9776b75
-size 151426
+oid sha256:32aac106da578f796e423e2dd7f8688f5cce45a448dc551003406bad17e29c06
+size 152519
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png
index 0590c2072..35b792072 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:76591f78b20b0d0996193db0d75a75c325a42cdc94e88ad90d18019b56ca3c3e
-size 111201
+oid sha256:ee8d5426c4460e8800e63e2c0d5c3e40cbcbe3431774a6f6b3e0f488276cdde6
+size 112192
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
index e8ac3cf83..27aef349e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0a5ff4dc40b87bf357069fdf844414749be3628640866981ee95a22f238777c2
-size 107390
+oid sha256:914d5ae54208552c17b21fc42f122f2a5545a8869971ee1bedc423cbfff82a8b
+size 107558
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
index 51105d2f5..dba7a0cbb 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8b04890c3682e653244fcca3a9bba27ff505c29377cce818414181b8370ba26f
-size 134429
+oid sha256:62073a8befd4de402454c6d01af8f901280c13e61ace6ac75695e9dcf767b1f0
+size 134660
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
index 3c906a2c0..96d017490 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cf84b77f9dc5e6f3e9149f06491af97bc94d6be17425aff9be9c7a8f71bfbe59
-size 133905
+oid sha256:d21df40849ecd89d8a1cebdcbf153c1940804060f01615028fed5520a11e6e7c
+size 134137
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
index e286ab690..f8f2a5904 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4bfe52e98b3944d0781639843e53ba3e64398926ac71380a4697519386dc9ac9
-size 109949
+oid sha256:3eeeb22ac4828027c9e5deafb2f0e0c1a85b82a723ba4fa743d4e8443dcd9d9e
+size 109894
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
index 361919f57..aa55229f9 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c00cee0b39db0bdaf922553c663c83f7179373d341ecbb4b007675ed4a2692f8
-size 118253
+oid sha256:31eb3c12f180525801466c72cb11c0966013fb2b18257d57fe10fb9f10739fd9
+size 118208
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
index 76aa37cad..30332dd35 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3f500a57177ebf155c58c2210f244c454412a0367ed1b84f8f9bdfa5546d7c49
-size 125330
+oid sha256:7e94a140f7fec9432095ec474579527008bef99b333f8e0b60b55c7487a3692f
+size 125263
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
index cf426b9a1..54320192a 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b738b5877dbacd7095a1d3d5d8dd003b87fc3881bbf409caeaf6752103247a66
-size 121504
+oid sha256:2aa437de21fce0e4571190628f163fb33a0f047499a234508c8d9b9e4f1b5ccf
+size 121430
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
index f2d45a0be..1a8e18e7d 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:55e47ae6a4a8cf245861489b96ac3b0e292973d408fe35ad6cbe2741599b6665
-size 107793
+oid sha256:e1140ed1dee2f30a0856f7795af74e034af48a3099c6f71ceffb0c02745c91e6
+size 107738
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
index 1b98c0100..0f744fb57 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:39c36b97fa5568a8045774eff3a9b3990b23964801f664dd0e19077ad83fc7b4
-size 121311
+oid sha256:8e4145747e82f7e983bce0a633cfe0d255e4cb2ce995764390999061e1d109a2
+size 121193
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
index bc001bec5..1b1868c11 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0c0db081b11178c40bb1786978735bd779e6a9e5da261cb735d9d907487f5279
-size 97737
+oid sha256:55fa6327fd529109b8341ac10659d750accef0702b4d7c39df07c827def87ca7
+size 97771
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png
index bf95c09f8..1e98e6618 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9c55565117038ff408b9879bf4b9aabd25672da6b947c2b0a10275221b99a8b5
-size 98659
+oid sha256:d0c8f14034cf3b7ec84ea309e02ef139ae9ef6556137c1c0a4348286faac3a8f
+size 98718
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
index ad869d779..e0e772f5e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:846e9447940ccf23f4944b78e2e730c716a1811fd37151ac26ed4efa2d04e7eb
+oid sha256:d501ea8baed54129ac0e145bb0ede2874fa743d163b8043c71f6d50b863473be
size 95667
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png
index 37eb38158..fce7cedec 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:88b8a6e1615b3f51497a00859076aa9cde30bca6e04ab863392419ebb3488ca9
-size 96237
+oid sha256:5a97dd7ddbdd51f54037159f1571c217d4ca5cb772d49ed0ed083b5071962d97
+size 96350
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png
index 0ce769df1..ad9106b2e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:707695c13225b2eb4c1bbb81bf6242ca7b238bf12791f47c38cf0a2b5fe87080
-size 219020
+oid sha256:5b2051e4eb8df0c67d24f0fd9b123ef3657564e0ba621d78e9c225f80230f1b6
+size 219031
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png
index 867231997..5c8865419 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2b018e0c22bb0be6c0d0e4767f921db3a458c6ea7a02aa60628490389de1f79f
-size 96277
+oid sha256:830a927a8fe0b2280f4584f163c5bdcde202ba6073d631b7444b8ca143ca233f
+size 96051
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png b/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png
index 8f212f477..5f15f8494 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:68a5f31e5986dbf8fd84c5eefffa108561e9ce985a69e6b9a27846f426a77eff
-size 99837
+oid sha256:ccfb8d354e43d1b1f878051aee601d48c15ccb33d24c3388a735b32b2b1a3ff9
+size 99864
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png b/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png
index 9dd850011..d44ed3629 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d275af4b2d337cba49b1bccc91fd89a5b01b29c39cb3a74d2d0b0591f4b65fc2
-size 96268
+oid sha256:364edbf6a0fde65653f3d4b90a5a246a0cacbc43686a4497f465518e5e2f506f
+size 96082
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png b/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png
index a6b7d228d..4e7a08877 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c398dcd4fa22c35880baf56ce9b5dd92b9f2cccb0b901ce55a24cc0f83bb8845
-size 91998
+oid sha256:33d7b8272a1e622dbb9dbd5c1c52c799b8824a3935a6d068527008e29bfba5eb
+size 92008
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png
index 4bba3a66e..ed29d3954 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:864c6a06bd55be132bf5724f1513160b3d687c21f1a2bac1dd378810ff787fb4
-size 55934
+oid sha256:8d385e8f2a2a6cfd713de7884abd8d42ec5e9b556c30d5b9a466595bff5a4bee
+size 55953
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png
index a31a5168d..0f1adcbbb 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ad878b38347d644944ca7b9f77bc62f69ec8243de0b9f2b6b8b9291eecc82309
-size 338034
+oid sha256:ee6a1e24fcf322ebb7441bd6ac55a5ec9738b54395b0963e5eaa2170c8c645ad
+size 337562
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png
index 0155743a1..1ecfeb2d5 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cd888b282323ffde3f179aaa9b30239e1801bc0afb7af1f7b3f6410b42e62583
-size 337169
+oid sha256:920fc39cc94a109b1ee7ffe511b80b1f83389825b8251e3038c75eecd9e18af0
+size 336676
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
index 5fbf1ada7..91ed1b59b 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7e61b6f920e8b7fe39b7991801d50b28e97ebc2166e8b842f9b1404e2c524d32
-size 150838
+oid sha256:a61d69af0c36fff29b81ce9cb5cf222746a47fd0cf6263dbca77fa79774854df
+size 151737
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png
index 0b8ada83d..7753514f1 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1063dd5c24689278e9adb10af716a3d40bcd78e0371a02669f97cfd470185224
-size 377469
+oid sha256:68e8f7d915852cb4d7b31f71d40761c8220a421338f2b9f684f77c341e34ed6d
+size 377505
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png
index eda87c872..424fafeb4 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fa55c2da53a661e2218356fb8a7165da0bdc5d8ca09b36c074814070779f8cba
-size 198157
+oid sha256:6028b635d3f203002f52ffd2f250cd73ece14757686fd031a58e208c50a86531
+size 197564
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
index f1df64ee0..3079749a7 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:914f0bd8b4257860d40be320cbfdc306cfa68e57aee940da5fb9749db7c68a2e
-size 154724
+oid sha256:1361941a0833e448836b7382d28f27c6e8736ae70112dc67ffe2934680438b37
+size 154898
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineView.1.png
index 0a2139f8b..272a32fbb 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2553f6a63765caafd7076b7672518b3dbce97ed206e2b162e2a6954fb710a841
-size 311700
+oid sha256:92666244d7c2a27b34509e41af7d960ab61eca3ef0bdbcdb62f4f25dd87adefb
+size 311453
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png
index 0a2139f8b..272a32fbb 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2553f6a63765caafd7076b7672518b3dbce97ed206e2b162e2a6954fb710a841
-size 311700
+oid sha256:92666244d7c2a27b34509e41af7d960ab61eca3ef0bdbcdb62f4f25dd87adefb
+size 311453
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png
index d6c1edf4f..9e3f32dad 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:004e3d149e91b27f7ba408bb829ce10c986f83a771ddf1e196369cf7c8d89d60
-size 101672
+oid sha256:459c43fcbebb8682b03d157a52ae3092c011a0536bdd6e0c32bfcb132e8faac3
+size 101730
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png b/UnitTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png
index e3a16b034..7bb7ef06d 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7819c17cf316c4bb89571b95dfd7c6e1bb8497e8d759bc29900682d33cae4b71
-size 145712
+oid sha256:e581d8283c932491ee0094d54be8de20d8218c99317c30785338f5f511eaed3f
+size 145982
diff --git a/project.yml b/project.yml
index c2889eb6b..62ec6f824 100644
--- a/project.yml
+++ b/project.yml
@@ -51,7 +51,7 @@ packages:
# path: ../matrix-rust-sdk
Compound:
url: https://github.com/element-hq/compound-ios
- revision: 787d62f7388ed7cc7812dcbf8a3f090e793cdb12
+ revision: b2d1227d8628a28dafb85ae057a8df4bb7279029
# path: ../compound-ios
AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events