mirror of
https://github.com/element-hq/element-x-ios.git
synced 2025-03-10 21:39:12 +00:00
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:
parent
7373eabffb
commit
5bac2c70a4
@ -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 {
|
||||
|
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.Room-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPad-en-GB-0.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPad-en-GB-0.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPad-pseudo-0.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPad-pseudo-0.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPhone-16-en-GB-0.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPhone-16-en-GB-0.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPhone-16-pseudo-0.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/badgeLabel.iPhone-16-pseudo-0.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Banned-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Forbidden-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.InviteRequired-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Invited-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Joinable-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Knockable-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreen.Restricted-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-pseudo.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-16-en-GB.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-16-en-GB.png
(Stored with Git LFS)
Binary file not shown.
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-16-pseudo.png
(Stored with Git LFS)
BIN
PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-16-pseudo.png
(Stored with Git LFS)
Binary file not shown.
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user