From 87f772647bdcd15239b423411327aa6f450e0a5a Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:47:06 +0000
Subject: [PATCH] Update Compound with new Pill colours. (#1989)

---
 ElementX.xcodeproj/project.pbxproj                            | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +-
 ElementX/Sources/Other/Pills/PillView.swift                   | 2 +-
 .../__Snapshots__/PreviewTests/test_pillView.All-Users.png    | 4 ++--
 .../PreviewTests/test_pillView.Loaded-Long-Own.png            | 4 ++--
 .../__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png  | 4 ++--
 .../__Snapshots__/PreviewTests/test_pillView.Loading-Own.png  | 4 ++--
 .../__Snapshots__/PreviewTests/test_pillView.Loading.png      | 4 ++--
 changelog.d/pr-1989.change                                    | 1 +
 project.yml                                                   | 2 +-
 10 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 changelog.d/pr-1989.change

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 959ee96a7..adc31e49a 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -6628,7 +6628,7 @@
 			repositoryURL = "https://github.com/vector-im/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = 01b71e45542a73cb2dd8d5e56d289abff68fe715;
+				revision = eba9d995974fcedd55549395d56e336e5ff70cdf;
 			};
 		};
 		9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index c763fb312..e53e4fd19 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -13,7 +13,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vector-im/compound-ios",
       "state" : {
-        "revision" : "01b71e45542a73cb2dd8d5e56d289abff68fe715"
+        "revision" : "eba9d995974fcedd55549395d56e336e5ff70cdf"
       }
     },
     {
diff --git a/ElementX/Sources/Other/Pills/PillView.swift b/ElementX/Sources/Other/Pills/PillView.swift
index 9ba7bc003..a846f7f4a 100644
--- a/ElementX/Sources/Other/Pills/PillView.swift
+++ b/ElementX/Sources/Other/Pills/PillView.swift
@@ -23,7 +23,7 @@ struct PillView: View {
     let didChangeText: () -> Void
     
     var textColor: Color {
-        context.viewState.isOwnMention ? .compound.textOnSolidPrimary : .compound.textSuccessPrimary
+        context.viewState.isOwnMention ? .compound._textOwnPill : .compound.textPrimary
     }
     
     var backgroundColor: Color {
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png b/UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png
index f258fcb58..641260124 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb1c8657a870af18a771b7a6b1be6c732ff2e9dfb4b69a558f453ce16d8711e7
-size 60309
+oid sha256:f8b9614a420b7827e58a39e9c044b9e8024ad41e52a9e712542d267622ec8862
+size 60258
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png
index 001af364d..332535dd0 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:838977457413677c95b62440aba60f39767b5c57c2dc8bc04db17604836961bf
-size 66094
+oid sha256:b716b2f00a70032acce54cf0455a49bdd1b73df88c08b3385b97391f7a45134c
+size 66298
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png
index 2caef5543..987cf3cc1 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0a781a2db50c0e6b675fe4253421517bdb7c39584b0d810356e976a0dbf7e0e
-size 66299
+oid sha256:5b53fb8bd5f04dbb3742cab4e6fa98e8b8dd26dd171ffcd4d0d2412522f114e5
+size 66261
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png
index 9e7cbba60..029ee73c7 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc295464d789704bef51b0613c6d62a6f4b2273d2468a8c985db64065317b42e
-size 62830
+oid sha256:a72618a0196cce0c306483f37e449043dc6834852331c75a28f809b8bc50d55b
+size 62958
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png
index c93d8829d..df92921f8 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd328f4947f5550ac584574b69eec3c2de4f06d90c9fefabe19a36b039ef0ec0
-size 62922
+oid sha256:62c08b36306f25903ddaef234bfdeea79442060226741064d00c9fb5e5b27edd
+size 62923
diff --git a/changelog.d/pr-1989.change b/changelog.d/pr-1989.change
new file mode 100644
index 000000000..15fc0b75c
--- /dev/null
+++ b/changelog.d/pr-1989.change
@@ -0,0 +1 @@
+Update Compound and use new pill colours.
\ No newline at end of file
diff --git a/project.yml b/project.yml
index f2ae62e8a..12c3663e0 100644
--- a/project.yml
+++ b/project.yml
@@ -49,7 +49,7 @@ packages:
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/vector-im/compound-ios
-    revision: 01b71e45542a73cb2dd8d5e56d289abff68fe715
+    revision: eba9d995974fcedd55549395d56e336e5ff70cdf
     # path: ../compound-ios
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events