zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

chore: Fix hashtag follow button style

This commit is contained in:
Marcus Kida 2022-12-01 14:52:55 +01:00
parent 324e782fd5
commit 6c2fabaa03
No known key found for this signature in database
GPG Key ID: 19FF64E08013CA40
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mastodon/Scene/HashtagTimeline/HashtagTimelineHeaderView.swift
View File

@ -157,18 +157,10 @@ extension HashtagTimelineHeaderView {
followButton.backgroundColor = entity.following == true ? Asset.Colors.Button.tagUnfollow.color : Asset.Colors.Button.tagFollow.color followButton.backgroundColor = entity.following == true ? Asset.Colors.Button.tagUnfollow.color : Asset.Colors.Button.tagFollow.color
switch traitCollection.userInterfaceStyle {
case .dark:
followButton.setTitleColor(
.lightGray,
for: .normal
)
default:
followButton.setTitleColor( followButton.setTitleColor(
entity.following == true ? Asset.Colors.Button.tagFollow.color : Asset.Colors.Button.tagUnfollow.color, entity.following == true ? Asset.Colors.Button.tagFollow.color : Asset.Colors.Button.tagUnfollow.color,
for: .normal for: .normal
) )
}
postCountLabel.text = String(entity.postCount) postCountLabel.text = String(entity.postCount)
participantsLabel.text = String(entity.participantsCount) participantsLabel.text = String(entity.participantsCount)

11
Mastodon/Scene/HashtagTimeline/HashtagTimelineHeaderViewActionButton.swift
View File

@ -22,8 +22,17 @@ class HashtagTimelineHeaderViewActionButton: RoundedEdgesButton {
public override func layoutSubviews() { public override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
let shadowColor: UIColor = {
switch traitCollection.userInterfaceStyle {
case .dark:
return .darkGray
default:
return .lightGray
}
}()
layer.setupShadow( layer.setupShadow(
color: .lightGray, color: shadowColor,
alpha: 1, alpha: 1,
x: 0, x: 0,
y: 1, y: 1,

8
MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Colors/Button/tagFollow.colorset/Contents.json
View File

@ -22,10 +22,10 @@
"color" : { "color" : {
"color-space" : "srgb", "color-space" : "srgb",
"components" : { "components" : {
"alpha" : "0.700", "alpha" : "1.000",
"blue" : "0x38", "blue" : "0xFF",
"green" : "0x29", "green" : "0xFF",
"red" : "0x2B" "red" : "0xFF"
} }
}, },
"idiom" : "universal" "idiom" : "universal"

2
MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Colors/Button/tagUnfollow.colorset/Contents.json
View File

@ -22,7 +22,7 @@
"color" : { "color" : {
"color-space" : "srgb", "color-space" : "srgb",
"components" : { "components" : {
"alpha" : "0.250", "alpha" : "1.000",
"blue" : "0x38", "blue" : "0x38",
"green" : "0x29", "green" : "0x29",
"red" : "0x2B" "red" : "0x2B"