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:
Stefan Ceriu 2025-03-10 09:46:46 +02:00
parent 7373eabffb
commit 5bac2c70a4
45 changed files with 95 additions and 104 deletions

View File

@ -8654,7 +8654,7 @@
repositoryURL = "https://github.com/element-hq/compound-ios";
requirement = {
kind = revision;
revision = 5af528a2925816ab0ee1945c6321e7c476baca8a;
revision = 978a953fac36472b772dbd38263ebc81b96bfdce;
};
};
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {

View File

@ -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"
}
},
{

View File

@ -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"

View File

@ -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 {

View File

@ -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