From f15f9e1fa93ff63dd2ff7a776f39b7897abb0aa6 Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 7 Jun 2023 00:51:11 +0800 Subject: [PATCH] Fix tvOS and watchOS HTML black text issue --- Forumate/View/StarterIntro/StarterIntro.swift | 4 +++- HtmlText/Sources/HtmlText/HtmlText.swift | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Forumate/View/StarterIntro/StarterIntro.swift b/Forumate/View/StarterIntro/StarterIntro.swift index 239fd7c..2a2a266 100644 --- a/Forumate/View/StarterIntro/StarterIntro.swift +++ b/Forumate/View/StarterIntro/StarterIntro.swift @@ -10,8 +10,10 @@ import SwiftUI struct StarterIntro: View { @Environment(\.dismiss) private var dismiss @Environment(\.supportsMultipleWindows) private var supportsMultipleWindows + #if os(iOS) @Environment(\.verticalSizeClass) private var verticalSizeClass - + #endif + var body: some View { VStack { ScrollView { diff --git a/HtmlText/Sources/HtmlText/HtmlText.swift b/HtmlText/Sources/HtmlText/HtmlText.swift index e2d1b20..a583474 100644 --- a/HtmlText/Sources/HtmlText/HtmlText.swift +++ b/HtmlText/Sources/HtmlText/HtmlText.swift @@ -34,7 +34,7 @@ public struct HtmlText: View { public var body: some View { if let nsAttributedString = try? NSAttributedString(data: Data(html.utf8), options: [.documentType: NSAttributedString.DocumentType.html], documentAttributes: nil), - let attributedString = try? AttributedString(nsAttributedString, including: \.uiKit) { + let attributedString = try? AttributedString(nsAttributedString, including: \.swiftUI) { Text(attributedString) } else { // fallback...