Adjust the PillView and BadgeLabel to the new compound styles
This commit is contained in:
@@ -15,11 +15,11 @@ struct PillView: View {
|
||||
let didChangeText: () -> Void
|
||||
|
||||
var textColor: Color {
|
||||
context.viewState.isOwnMention ? .compound.textBadgeAccent : .compound.textPrimary
|
||||
context.viewState.isOwnMention ? .compound.textBadgeAccent : .compound.textOnSolidPrimary
|
||||
}
|
||||
|
||||
var backgroundColor: Color {
|
||||
context.viewState.isOwnMention ? .compound.bgBadgeAccent : .compound.bgBadgeDefault
|
||||
context.viewState.isOwnMention ? .compound.bgBadgeAccent : .compound.bgBadgePrimary
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
|
||||
@@ -55,6 +55,13 @@ struct BadgeLabel: View {
|
||||
}
|
||||
}
|
||||
|
||||
var borderColor: Color {
|
||||
switch style {
|
||||
case .default: .compound.borderInteractiveSecondary
|
||||
default: .clear
|
||||
}
|
||||
}
|
||||
|
||||
func makeBody(configuration: Configuration) -> some View {
|
||||
HStack(spacing: 4) {
|
||||
configuration.icon
|
||||
@@ -66,7 +73,11 @@ struct BadgeLabel: View {
|
||||
.padding(.leading, 8)
|
||||
.padding(.trailing, 12)
|
||||
.padding(.vertical, 4)
|
||||
.background(Capsule().fill(backgroundColor))
|
||||
.background {
|
||||
Capsule().fill(backgroundColor).overlay {
|
||||
Capsule().stroke(borderColor)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user