Fixes #3867 - Change bage label colors to blue when not highlighted
- bumps compound to get new semantic tokens - updates related snapshots - the composer updates have already been handled separately
This commit is contained in:
@@ -8654,7 +8654,7 @@
|
||||
repositoryURL = "https://github.com/element-hq/compound-ios";
|
||||
requirement = {
|
||||
kind = revision;
|
||||
revision = 5af528a2925816ab0ee1945c6321e7c476baca8a;
|
||||
revision = 978a953fac36472b772dbd38263ebc81b96bfdce;
|
||||
};
|
||||
};
|
||||
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/element-hq/compound-design-tokens",
|
||||
"state" : {
|
||||
"revision" : "3e3f83f61ad48acc8532636a773ccdeafd3834fe",
|
||||
"version" : "4.0.0"
|
||||
"revision" : "45818d8a7183a6838414791de50fbcea6a49100c",
|
||||
"version" : "4.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -15,7 +15,7 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/element-hq/compound-ios",
|
||||
"state" : {
|
||||
"revision" : "5af528a2925816ab0ee1945c6321e7c476baca8a"
|
||||
"revision" : "978a953fac36472b772dbd38263ebc81b96bfdce"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES"
|
||||
runPostActionsOnFailure = "NO">
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
@@ -30,12 +29,6 @@
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
codeCoverageEnabled = "YES"
|
||||
onlyGenerateCoverageForSpecifiedTargets = "YES">
|
||||
<TestPlans>
|
||||
<TestPlanReference
|
||||
default = "YES"
|
||||
reference = "container:PreviewTests/SupportingFiles/PreviewTests.xctestplan">
|
||||
</TestPlanReference>
|
||||
</TestPlans>
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
@@ -45,10 +38,6 @@
|
||||
ReferencedContainer = "container:ElementX.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<Testables>
|
||||
</Testables>
|
||||
<CommandLineArguments>
|
||||
</CommandLineArguments>
|
||||
<CodeCoverageTargets>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
@@ -58,6 +47,12 @@
|
||||
ReferencedContainer = "container:ElementX.xcodeproj">
|
||||
</BuildableReference>
|
||||
</CodeCoverageTargets>
|
||||
<TestPlans>
|
||||
<TestPlanReference
|
||||
reference = "container:PreviewTests/SupportingFiles/PreviewTests.xctestplan"
|
||||
default = "YES">
|
||||
</TestPlanReference>
|
||||
</TestPlans>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
@@ -78,8 +73,6 @@
|
||||
ReferencedContainer = "container:ElementX.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<CommandLineArguments>
|
||||
</CommandLineArguments>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
@@ -87,8 +80,6 @@
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<CommandLineArguments>
|
||||
</CommandLineArguments>
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
|
||||
@@ -26,15 +26,15 @@ private struct BadgeLabelStyle: LabelStyle {
|
||||
let isHighlighted: Bool
|
||||
|
||||
var titleColor: Color {
|
||||
isHighlighted ? .compound._badgeTextSuccess : .compound._badgeTextSubtle
|
||||
isHighlighted ? .compound.textBadgeAccent : .compound.textBadgeInfo
|
||||
}
|
||||
|
||||
var iconColor: Color {
|
||||
isHighlighted ? .compound.iconSuccessPrimary : .compound.iconSecondary
|
||||
isHighlighted ? .compound.iconSuccessPrimary : .compound.iconInfoPrimary
|
||||
}
|
||||
|
||||
var backgroundColor: Color {
|
||||
isHighlighted ? .compound._bgBadgeSuccess : .compound.bgSubtlePrimary
|
||||
isHighlighted ? .compound.bgBadgeAccent : .compound.bgBadgeInfo
|
||||
}
|
||||
|
||||
func makeBody(configuration: Configuration) -> some View {
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1aae2519f669484990559209c3cfeaa9e0980cb69588a145c1d600b2cffcc368
|
||||
size 174462
|
||||
oid sha256:28f9c9a0f3d816dac8818f832327f4c5f28499ad0d5aaa04acef29d4118f6672
|
||||
size 174382
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8986ac7b673981a7daeda3e9b81ae1e783697aa7f5c1481b04ed0bfd26ee227c
|
||||
size 175785
|
||||
oid sha256:56701625042e00c43a7db4a4a23175207393df4df78915fca5a8dadcfc03259d
|
||||
size 175753
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da7f99999b75e929c0f097f936763bc16c6287604506b13ac079952f1f6e7f85
|
||||
size 115043
|
||||
oid sha256:add8a54fe304853bbab5d75586b26a3fecbecf488d40f175be609cb386ad84df
|
||||
size 115082
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:71c9301cf503e1cd39f889a85f635ddfdab8b49bf34f19af5ca4805e42b9a7b3
|
||||
size 119564
|
||||
oid sha256:b6ea4ed79f1c5a6b29ab0299a0c2eaefa30eb69193c6448bf3bc58bab19aab73
|
||||
size 119461
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0e7c9aa052f8f318d33134c119d9fc58fba2fdd3b4ecc56008ff5dc06afdfbdb
|
||||
size 75502
|
||||
oid sha256:2d7c3c922a7f7dcc3603262eb901acab8800d32dfa1966e7da944c8ce2153b8a
|
||||
size 75689
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0e7c9aa052f8f318d33134c119d9fc58fba2fdd3b4ecc56008ff5dc06afdfbdb
|
||||
size 75502
|
||||
oid sha256:2d7c3c922a7f7dcc3603262eb901acab8800d32dfa1966e7da944c8ce2153b8a
|
||||
size 75689
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e466f58bcb1f50a430e7f1baeeb62e297c9c25d9c9133caf9a61d4c43aa91ccd
|
||||
size 34524
|
||||
oid sha256:970fd6a95b0ae9893db5f863950bdd6cbe2e12f648307d6990ae9e0881b95754
|
||||
size 34260
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e466f58bcb1f50a430e7f1baeeb62e297c9c25d9c9133caf9a61d4c43aa91ccd
|
||||
size 34524
|
||||
oid sha256:970fd6a95b0ae9893db5f863950bdd6cbe2e12f648307d6990ae9e0881b95754
|
||||
size 34260
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5d2db9a6224f12a8c6dc8e8c02d1f3edeaf546451c0aea987a8413ad0ea30162
|
||||
size 216490
|
||||
oid sha256:d6a3b6e89a1ff7bb30db3a9ea236355385bf07444804c00c107722e95b981a64
|
||||
size 216430
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9a8f795dceadf53c56a644f602e7ffe10e4c799c66ce129372203082caaf290e
|
||||
size 226588
|
||||
oid sha256:922fbd4b56d238c3b7ef9c5e529b2257a12fc75511ebdac349c27e2696210fbf
|
||||
size 226528
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f067ae3ffaf8297d47736cc8bba52ede98ad9fc7b6efb8976fddc642a01043d8
|
||||
size 157096
|
||||
oid sha256:cd459fd3581f979838780ad99c5026552dce1318f0a5c4bb2ade9269e2f705f6
|
||||
size 157046
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:92a4f759fea226eb93940199091142cb62f18406f131d2c8d096eda3fa4486a7
|
||||
size 171483
|
||||
oid sha256:6016b174a73b682d6df9e41150a2a86ac51def9e56220a1cee401fca119a765d
|
||||
size 171433
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3635f4d278caaa287a76e31b6d7ba5e7a1c69d2d23fc73ed1a92e42aa5853bc7
|
||||
size 217738
|
||||
oid sha256:b90471806784ade660558edc3aa3a6922b7b8d6c9d2b656645e364283536be00
|
||||
size 217678
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d6824c2730ffa4964b00bac58dc6139e084460a859d0e5211529dbeb3fbc4841
|
||||
size 230554
|
||||
oid sha256:f52d766fdd893174c06301ff8b91a992a8e1d15ab1233cbc6cb6d66df604fa92
|
||||
size 230494
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e3e637df7824aed7ab79c83a4d393e8ffe6abb7e8c6674abc934ebf2031ec261
|
||||
size 156985
|
||||
oid sha256:e567ff28675f79f6d2c885c50192128188481e55181b77b0f6a810fc9312dc63
|
||||
size 156935
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a3f3e878023567abb54751987be9277abbe706ba2934dd5f21d1582b45dd1b43
|
||||
size 175443
|
||||
oid sha256:5e3df2a317be7b99358cd4ec533a353755813d5ab0afbac073e050673dbdc807
|
||||
size 175393
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:605f8bd42e0151d31d6b28f024b50c24f97d98634cab67bd20d328114e957b92
|
||||
size 199953
|
||||
oid sha256:9639d47f3a0de132facc4072a11f0ae98732b171aa7b69c7333dbb1c4e1eb5b0
|
||||
size 199893
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da387fae9482894a0902a18c8449e4e3c406ad1c06db80325d92f2fca9dd29d5
|
||||
size 206327
|
||||
oid sha256:a5c094b4db20c4ce59d0e8e4a80c945b1c3e5adbd695fc06a6d95fd43de9de05
|
||||
size 206267
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38bf1dcae3fc0948fcf08085e114923015cef6c16f78dac0f7afb96ff15a4a89
|
||||
size 143064
|
||||
oid sha256:7eff5759c73dc67bacf5e1c52a534fc397e2bbaccae81680cb993b4d9c8cf3e1
|
||||
size 143014
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:473d7cd5bf841073849877deab1fc31d7b1fe674dd04be7ff9de26ef7e34894a
|
||||
size 151639
|
||||
oid sha256:b5ee9c19d02ca998686bfca6d8d1b10451ed8b81a7af25b0e06c08e279215913
|
||||
size 151589
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bafb1d1d2e8b76b8e70270eba454565390807c7b43b57a30574faaa856de3e9b
|
||||
size 214533
|
||||
oid sha256:dca2662379e8739e90dad3809f5eb241fb5b51bd28464741bd765b81a685fd9d
|
||||
size 214504
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6709e288902aee862be1fc0ae7b62e9416498dc2b31617c13aae42ff556ae3ae
|
||||
size 218048
|
||||
oid sha256:9885cba7a9b020f28ff5b999e3bddacd81e4acecb88c8513594cdcb7189301c5
|
||||
size 218008
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e2582840f3d0f9f77cd3a4f3d2cadf62d64e9d15dfd9506876041a70232d3823
|
||||
size 154217
|
||||
oid sha256:6e6087c3e34ad55cb80dfa3aa639d1f38143a21ffd11386bf7401ef4a475b348
|
||||
size 154147
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b94491c955d57142c58146c4710eb91f51a6799c2a17027182e7bbddcc2fe97
|
||||
size 163691
|
||||
oid sha256:44ce659b81a922f8cf2ebbc4d33f5d274ec7d978884eda467ab9725239864016
|
||||
size 163608
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e9d92a092e434b3f6431c7212c19e3c821474a0351b34963ade766fca5444c2a
|
||||
size 207445
|
||||
oid sha256:684937fac8705d72d8bcafa6ecb797a19b0013dd0a1a66f6cc66b7dd5593e494
|
||||
size 207385
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:708e789b3933927b70b039cf78136db86a097a5331fce59a0360506d9ddbf57d
|
||||
size 208515
|
||||
oid sha256:bb1db0c694e7cc06780339db5a834f2868dc35db8d02e3a99087da002ae1a5ba
|
||||
size 208455
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3dddeb90a8180bebeed727b1f3abde98acabd22e2b016daebaca6ef6eb484f43
|
||||
size 144931
|
||||
oid sha256:6e82443e582194f2598dd395f5582d9bfcdac97f01106ccc1372998920a819bc
|
||||
size 144881
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:140d11cf29fcc2144f8f1db87e72ab773ec3e76e59eb7c2d15d4194cb44a4b07
|
||||
size 146942
|
||||
oid sha256:001088c542179f4f3c7c5e829322d9018bcaf8a487bd457233f48d8dbcad3456
|
||||
size 146892
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9ab8bdc3a40f5a38ee7faef7e73036de6ccfbc9e9b17001f192280ea10a2bd28
|
||||
size 219352
|
||||
oid sha256:3342b8c4ab9233bb9b389a1cd933d59293f5023c5409ac6f07e22347f8535bc2
|
||||
size 219318
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e85b90ff10354b4132968a8e5e929d5483f0203ff7ce24d2c8e91a6648cfc20f
|
||||
size 227302
|
||||
oid sha256:86720d94cd73fa2ab46b8ee14972171b6fd7de498f4d02dcaa089268879f136d
|
||||
size 227268
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8724372d6bf74353ee39b3583b34afe18842dc8d3e3be2ff6bb1d3b2747e8bbb
|
||||
size 154606
|
||||
oid sha256:1a6a64324e0a7bd1ebccceb05b4380c1d5d6d510bd10dd4d7951d5cae0f185e0
|
||||
size 154557
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:616d0602d37fe8b58069f1593340c26a14cf57aa7d3e843aa4843315205aaaf0
|
||||
size 160834
|
||||
oid sha256:8c34026c86963d751bfb61e965653d53d256771fb0833675167d53055e60044a
|
||||
size 160785
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f3df07c3783a727e7ab4f4a02868a5b0cc50e84b08b935620f72d596e9d0440
|
||||
size 223555
|
||||
oid sha256:b678cbdc4f3bbeb3bd3738348fa5d272ace33d2d980bebe9aa07aa4e979506c6
|
||||
size 223495
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8728eaab603e87809ba3005f47572e7d0839d413b2fed657c6ba7bb1aab4a755
|
||||
size 234862
|
||||
oid sha256:f7b9b06828fbbdb6f471e1ad9d6f3b3941c89371590bea2105e32dfe3991db10
|
||||
size 234802
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dfd3ae65ce90432d42583a7149cd1d9b85558039cac7fb37d37093fa3dcbaeed
|
||||
size 161620
|
||||
oid sha256:21ade84e0ba1fa5a9357e31f2bd0dda10e8e8a0e8e951ae66bb6baec03ce70ec
|
||||
size 161570
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fd8f6c9f822e54944f3da015c6af5e9e36b6bb3dda3af23ddbf888f210386bc7
|
||||
size 176923
|
||||
oid sha256:a8fe17c3ba373103f8f34f796f4f1ee21a509cd153904a863ede92402f80ca49
|
||||
size 176873
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7aa797661a0d2151d79557f8839e0b0abbbe40eda5586461816333fac6f34771
|
||||
size 150755
|
||||
oid sha256:1dc3179c392491c8e03f04146ecd56a18b5ab51e6ac41796340b2d5c0ba72f04
|
||||
size 150486
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cd792ffcaacf962eae4d9db64df8c6a08e2ac296cc60386e9d2ea44a5f6b5d36
|
||||
size 161291
|
||||
oid sha256:8b92ce2a3f41ba9ed23237117f0e36ce21d93e555d120a901fd663727955d418
|
||||
size 161272
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0f13c3f82415d788b5d33bb1a506f0d794b54565735a99b392ce9572505f54e0
|
||||
size 97533
|
||||
oid sha256:abda00b72636d569661f53e311a36710903cd64fff26c8ffa7b0b48aa2e9521b
|
||||
size 97498
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a23da1de681ac6fa531eca32a16a6f0c2117ce701fc6424606cf368dcb3cae72
|
||||
size 112090
|
||||
oid sha256:7d09c7ab9d13377386b79f7e3057f3c9ca0ed230fe403edba755fae1c09cef5f
|
||||
size 112043
|
||||
|
||||
@@ -63,7 +63,7 @@ packages:
|
||||
# path: ../matrix-rust-sdk
|
||||
Compound:
|
||||
url: https://github.com/element-hq/compound-ios
|
||||
revision: 5af528a2925816ab0ee1945c6321e7c476baca8a
|
||||
revision: 978a953fac36472b772dbd38263ebc81b96bfdce
|
||||
# path: ../compound-ios
|
||||
AnalyticsEvents:
|
||||
url: https://github.com/matrix-org/matrix-analytics-events
|
||||
|
||||
Reference in New Issue
Block a user