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

Color the verified link’s header green as well to match the website

This commit is contained in:
Jed Fox 2022-11-16 20:44:55 -05:00
parent c6826542f9
commit c34f0b4f11
No known key found for this signature in database
GPG Key ID: 0B61D18EA54B47E1
5 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mastodon/Diffable/Profile/ProfileFieldSection.swift
View File

@ -55,17 +55,20 @@ extension ProfileFieldSection {
} }
// set key // set key
let keyColor = verified ? Asset.Scene.Profile.About.bioAboutFieldVerifiedText.color : Asset.Colors.Label.secondary.color
do { do {
let mastodonContent = MastodonContent(content: key, emojis: emojiMeta) let mastodonContent = MastodonContent(content: key, emojis: emojiMeta)
let metaContent = try MastodonMetaContent.convert(document: mastodonContent) let metaContent = try MastodonMetaContent.convert(document: mastodonContent)
cell.keyMetaLabel.textAttributes[.foregroundColor] = keyColor
cell.keyMetaLabel.configure(content: metaContent) cell.keyMetaLabel.configure(content: metaContent)
} catch { } catch {
let content = PlaintextMetaContent(string: key) let content = PlaintextMetaContent(string: key)
// cell.keyMetaLabel.textAttributes[.foregroundColor] = keyColor
cell.keyMetaLabel.configure(content: content) cell.keyMetaLabel.configure(content: content)
} }
// set value // set value
let linkColor = verified ? Asset.Scene.Profile.About.bioAboutFieldVerifiedLink.color : Asset.Colors.brand.color let linkColor = verified ? Asset.Scene.Profile.About.bioAboutFieldVerifiedText.color : Asset.Colors.brand.color
do { do {
let mastodonContent = MastodonContent(content: value, emojis: emojiMeta) let mastodonContent = MastodonContent(content: value, emojis: emojiMeta)
let metaContent = try MastodonMetaContent.convert(document: mastodonContent) let metaContent = try MastodonMetaContent.convert(document: mastodonContent)

2
Mastodon/Scene/Profile/About/Cell/ProfileFieldCollectionViewCell.swift
View File

@ -58,7 +58,7 @@ extension ProfileFieldCollectionViewCell {
private func _init() { private func _init() {
// Setup colors // Setup colors
checkmark.tintColor = Asset.Scene.Profile.About.bioAboutFieldVerifiedCheckmark.color; checkmark.tintColor = Asset.Scene.Profile.About.bioAboutFieldVerifiedText.color;
// Setup gestures // Setup gestures
tapGesture.addTarget(self, action: #selector(ProfileFieldCollectionViewCell.didTapCheckmark(_:))) tapGesture.addTarget(self, action: #selector(ProfileFieldCollectionViewCell.didTapCheckmark(_:)))

38
MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.link.colorset/Contents.json
View File

@ -1,38 +0,0 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.371",
"green" : "0.565",
"red" : "0.290"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.603",
"green" : "0.742",
"red" : "0.476"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

0
MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.checkmark.colorset/Contents.json → MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.text.colorset/Contents.json
View File

3
MastodonSDK/Sources/MastodonAsset/Generated/Assets.swift
View File

@ -173,8 +173,7 @@ public enum Asset {
public enum Profile { public enum Profile {
public enum About { public enum About {
public static let bioAboutFieldVerifiedBackground = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.background") public static let bioAboutFieldVerifiedBackground = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.background")
public static let bioAboutFieldVerifiedCheckmark = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.checkmark") public static let bioAboutFieldVerifiedText = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.text")
public static let bioAboutFieldVerifiedLink = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.link")
} }
public enum Banner { public enum Banner {
public static let bioEditBackgroundGray = ColorAsset(name: "Scene/Profile/Banner/bio.edit.background.gray") public static let bioEditBackgroundGray = ColorAsset(name: "Scene/Profile/Banner/bio.edit.background.gray")