ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Compound with new Pill colours. (#1989)

Browse Source
This commit is contained in:
Doug
2023-10-31 10:47:06 +00:00
committed by GitHub
parent af3732541e
commit 87f772647b
10 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+1 -1
View File
@@ -6628,7 +6628,7 @@
repositoryURL = "https://github.com/vector-im/compound-ios"; repositoryURL = "https://github.com/vector-im/compound-ios";
requirement = { requirement = {
kind = revision; kind = revision;
revision = 01b71e45542a73cb2dd8d5e56d289abff68fe715; revision = eba9d995974fcedd55549395d56e336e5ff70cdf;
}; };
}; };
9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = { 9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+1 -1
View File
@@ -13,7 +13,7 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/vector-im/compound-ios", "location" : "https://github.com/vector-im/compound-ios",
"state" : { "state" : {
"revision" : "01b71e45542a73cb2dd8d5e56d289abff68fe715" "revision" : "eba9d995974fcedd55549395d56e336e5ff70cdf"
} }
}, },
{ {
ElementX/Sources/Other/Pills/PillView.swift
+1 -1
View File
@@ -23,7 +23,7 @@ struct PillView: View {
let didChangeText: () -> Void let didChangeText: () -> Void
var textColor: Color { var textColor: Color {
context.viewState.isOwnMention ? .compound.textOnSolidPrimary : .compound.textSuccessPrimary context.viewState.isOwnMention ? .compound._textOwnPill : .compound.textPrimary
} }
var backgroundColor: Color { var backgroundColor: Color {
UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:cb1c8657a870af18a771b7a6b1be6c732ff2e9dfb4b69a558f453ce16d8711e7 oid sha256:f8b9614a420b7827e58a39e9c044b9e8024ad41e52a9e712542d267622ec8862
size 60309 size 60258
UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:838977457413677c95b62440aba60f39767b5c57c2dc8bc04db17604836961bf oid sha256:b716b2f00a70032acce54cf0455a49bdd1b73df88c08b3385b97391f7a45134c
size 66094 size 66298
UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b0a781a2db50c0e6b675fe4253421517bdb7c39584b0d810356e976a0dbf7e0e oid sha256:5b53fb8bd5f04dbb3742cab4e6fa98e8b8dd26dd171ffcd4d0d2412522f114e5
size 66299 size 66261
UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:dc295464d789704bef51b0613c6d62a6f4b2273d2468a8c985db64065317b42e oid sha256:a72618a0196cce0c306483f37e449043dc6834852331c75a28f809b8bc50d55b
size 62830 size 62958
UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:dd328f4947f5550ac584574b69eec3c2de4f06d90c9fefabe19a36b039ef0ec0 oid sha256:62c08b36306f25903ddaef234bfdeea79442060226741064d00c9fb5e5b27edd
size 62922 size 62923
changelog.d/pr-1989.change
+1
View File
@@ -0,0 +1 @@
Update Compound and use new pill colours.
project.yml
+1 -1
View File
@@ -49,7 +49,7 @@ packages:
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/vector-im/compound-ios url: https://github.com/vector-im/compound-ios
revision: 01b71e45542a73cb2dd8d5e56d289abff68fe715 revision: eba9d995974fcedd55549395d56e336e5ff70cdf
# path: ../compound-ios # path: ../compound-ios
AnalyticsEvents: AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events url: https://github.com/matrix-org/matrix-analytics-events