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

Use colors from assets (IOS-152)

This commit is contained in:
Nathan Mattes 2023-05-05 15:15:37 +02:00
parent d406dcd553
commit 0fbe54d368
5 changed files with 107 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MastodonSDK/Sources/MastodonUI/Extension/UIColor+Extensions.swift Normal file
View File

@ -0,0 +1,20 @@
// Copyright © 2023 Mastodon gGmbH. All rights reserved.
import UIKit
extension UIColor {
public var hexValue: String {
let components = cgColor.components
let red: CGFloat = components?[0] ?? 0.0
let green: CGFloat = components?[1] ?? 0.0
let blue: CGFloat = components?[2] ?? 0.0
return String(
format: "#%02lX%02lX%02lX",
lroundf(Float(red * 255)),
lroundf(Float(green * 255)),
lroundf(Float(blue * 255))
)
}
}

38
WidgetExtension/Assets.xcassets/Colors/Blurple.colorset/Contents.json Normal file
View File

@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.984",
"green" : "0.173",
"red" : "0.333"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.980",
"green" : "0.541",
"red" : "0.522"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

9
WidgetExtension/Assets.xcassets/Colors/Contents.json Normal file
View File

@ -0,0 +1,9 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"provides-namespace" : true
}
}

38
WidgetExtension/Assets.xcassets/Colors/TextColor.colorset/Contents.json Normal file
View File

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

4
WidgetExtension/Variants/Hashtag/HashtagWidgetView.swift
View File

@ -91,8 +91,8 @@ struct HashtagWidgetView: View {
extension Text {
init(statusHTML htmlString: String, fontSize: Int = 16, fontWeight: Int = 400, colorScheme: ColorScheme = .light) {
let textColor = (colorScheme == .light) ? "#000000" : "#FFFFFF"
let accentColor = (colorScheme == .light) ? "#563ACC" : "#858AFA"
let textColor = (UIColor(named: "Colors/TextColor") ?? UIColor.gray).hexValue
let accentColor = (UIColor(named: "Colors/Blurple") ?? UIColor.purple).hexValue
let fullHTML = """
<!doctype html>