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

Use correct color when switch between darkmode/lightmode (#1034) (#1039)

This commit is contained in:
Nathan Mattes 2023-05-10 11:10:17 +02:00 committed by GitHub
parent 4be4c046e8
commit b9502d4423
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
WidgetExtension/Assets.xcassets/Colors/Blurple.colorset/Contents.json → WidgetExtension/Assets.xcassets/Colors/AccentColor.colorset/Contents.json
View File

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

@ -1,6 +1,8 @@
// Copyright © 2023 Mastodon gGmbH. All rights reserved. // Copyright © 2023 Mastodon gGmbH. All rights reserved.
import SwiftUI import SwiftUI
import MetaTextKit
import MastodonMeta
import MastodonLocalization import MastodonLocalization
struct HashtagWidgetView: View { struct HashtagWidgetView: View {
@ -8,12 +10,11 @@ struct HashtagWidgetView: View {
var entry: HashtagWidgetProvider.Entry var entry: HashtagWidgetProvider.Entry
@Environment(\.widgetFamily) var family @Environment(\.widgetFamily) var family
@Environment(\.colorScheme) var colorScheme
var body: some View { var body: some View {
switch family { switch family {
case .systemMedium, .systemLarge: case .systemMedium, .systemLarge:
viewForMediumWidget(colorScheme: colorScheme) viewForMediumWidget()
case .accessoryRectangular: case .accessoryRectangular:
viewForRectangularAccessory() viewForRectangularAccessory()
default: default:
@ -21,7 +22,7 @@ struct HashtagWidgetView: View {
} }
} }
private func viewForMediumWidget(colorScheme: ColorScheme) -> some View { private func viewForMediumWidget() -> some View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
HStack { HStack {
Text(entry.hashtag.accountName) Text(entry.hashtag.accountName)
@ -38,9 +39,10 @@ struct HashtagWidgetView: View {
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
Text(statusHTML: entry.hashtag.content, colorScheme: colorScheme) Text(statusWithColorHashtags: entry.hashtag.content)
Spacer() Spacer()
HStack(alignment: .center, spacing: 16) { HStack(alignment: .center, spacing: 16) {
HStack(spacing: 0) { HStack(spacing: 0) {
Image(systemName: "arrow.2.squarepath") Image(systemName: "arrow.2.squarepath")
@ -81,7 +83,7 @@ struct HashtagWidgetView: View {
.fontWeight(.heavy) .fontWeight(.heavy)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
Text(statusHTML: entry.hashtag.content, fontSize: 11, fontWeight: 510) Text(statusWithColorHashtags: entry.hashtag.content, fontSize: 11, fontWeight: .medium)
.lineLimit(3) .lineLimit(3)
} }
} }
@ -89,46 +91,57 @@ struct HashtagWidgetView: View {
/// Inspired by: https://swiftuirecipes.com/blog/swiftui-text-with-html-via-nsattributedstring /// Inspired by: https://swiftuirecipes.com/blog/swiftui-text-with-html-via-nsattributedstring
extension Text { extension Text {
init(statusHTML htmlString: String, fontSize: Int = 16, fontWeight: Int = 400, colorScheme: ColorScheme = .light) { init(statusWithColorHashtags statusContent: String, fontSize: CGFloat = 16, fontWeight: UIFont.Weight = .regular) {
let textColor = (UIColor(named: "Colors/TextColor") ?? UIColor.gray).hexValue let textColor = UIColor(named: "Colors/TextColor") ?? .label
let accentColor = (UIColor(named: "Colors/Blurple") ?? UIColor.purple).hexValue let accentColor = UIColor(named: "Colors/AccentColor") ?? .red
let font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: fontSize, weight: fontWeight))
let fullHTML = """ let attributedString: AttributedString
<!doctype html> // 1. Render status-content as HTML ...
<html> if let data = statusContent.data(using: .utf8),
<head> let renderedString = try? NSAttributedString(data: data,
<style> options: [
body { .documentType: NSAttributedString.DocumentType.html,
font-family: -apple-system; .characterEncoding: NSUTF8StringEncoding
font-size: \(fontSize)px; ],
font-weight: \(fontWeight); documentAttributes: nil) {
line-height: 133%;
color: \(textColor);
}
a { // 2. let MetaTextKit do the rest
color: \(accentColor); let content = MastodonContent(content: renderedString.string, emojis: [:])
} attributedString = MastodonMetaContent.convert(text: content)
} .attributedString(textColor: textColor, accentColor: accentColor, font: font)
</style>
</head>
<body>
\(htmlString)
</body>
</html>
"""
let attributedString: NSAttributedString
if let data = fullHTML.data(using: .unicode),
let attrString = try? NSAttributedString(data: data,
options: [.documentType: NSAttributedString.DocumentType.html],
documentAttributes: nil) {
attributedString = attrString
} else { } else {
attributedString = NSAttributedString(string: htmlString) // this is a fallback
attributedString = AttributedString(NSAttributedString(string: statusContent))
} }
self.init(AttributedString(attributedString)) // uses the NSAttributedString initializer self.init(attributedString)
}
}
#warning("Replace this once we update MetaTextKit to `4.5.2`. We should do that.")
extension MetaContent {
public func attributedString(textColor: UIColor, accentColor: UIColor, font: UIFont) -> AttributedString {
let attributedString = NSMutableAttributedString(string: string, attributes: [
.foregroundColor: textColor,
.font: font
])
// meta
let stringRange = NSRange(location: 0, length: attributedString.length)
for entity in entities {
let range = NSIntersectionRange(stringRange, entity.range)
attributedString.addAttribute(.link, value: entity.encodedPrimaryText, range: range)
attributedString.addAttribute(.foregroundColor, value: accentColor, range: range)
}
return AttributedString(attributedString)
}
}
extension Meta.Entity {
public var encodedPrimaryText: String {
return primaryText.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? primaryText
} }
} }