Refactor release notes to use MarkdownUI library
- Create MarkdownContentView to encapsulate MarkdownUI rendering - Replace custom AttributedString markdown parsing with MarkdownUI - Simplify ReleaseNotesView by removing manual markdown styling - Improve markdown rendering with proper support for lists, links, and formatting - Make markdown rendering easily replaceable by keeping it in a dedicated view
This commit is contained in:
parent
db3cbf41d4
commit
85bad35788
35
readeck/UI/Settings/MarkdownContentView.swift
Normal file
35
readeck/UI/Settings/MarkdownContentView.swift
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
import SwiftUI
|
||||||
|
import MarkdownUI
|
||||||
|
|
||||||
|
/// A custom view that renders Markdown content using the MarkdownUI library.
|
||||||
|
/// This view encapsulates the Markdown rendering logic, making it easy to swap
|
||||||
|
/// the underlying Markdown library if needed in the future.
|
||||||
|
struct MarkdownContentView: View {
|
||||||
|
let content: String
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
Markdown(content)
|
||||||
|
.textSelection(.enabled)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#Preview {
|
||||||
|
ScrollView {
|
||||||
|
MarkdownContentView(content: """
|
||||||
|
# Heading 1
|
||||||
|
|
||||||
|
This is a paragraph with **bold** and *italic* text.
|
||||||
|
|
||||||
|
## Heading 2
|
||||||
|
|
||||||
|
- List item 1
|
||||||
|
- List item 2
|
||||||
|
- List item 3
|
||||||
|
|
||||||
|
### Heading 3
|
||||||
|
|
||||||
|
Another paragraph with [a link](https://example.com).
|
||||||
|
""")
|
||||||
|
.padding()
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,56 +1,14 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
extension AttributedString {
|
|
||||||
init(styledMarkdown markdownString: String) throws {
|
|
||||||
var output = try AttributedString(
|
|
||||||
markdown: markdownString,
|
|
||||||
options: .init(
|
|
||||||
allowsExtendedAttributes: true,
|
|
||||||
interpretedSyntax: .full,
|
|
||||||
failurePolicy: .returnPartiallyParsedIfPossible
|
|
||||||
),
|
|
||||||
baseURL: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
for (intentBlock, intentRange) in output.runs[AttributeScopes.FoundationAttributes.PresentationIntentAttribute.self].reversed() {
|
|
||||||
guard let intentBlock = intentBlock else { continue }
|
|
||||||
for intent in intentBlock.components {
|
|
||||||
switch intent.kind {
|
|
||||||
case .header(level: let level):
|
|
||||||
switch level {
|
|
||||||
case 1:
|
|
||||||
output[intentRange].font = .system(.title).bold()
|
|
||||||
case 2:
|
|
||||||
output[intentRange].font = .system(.title2).bold()
|
|
||||||
case 3:
|
|
||||||
output[intentRange].font = .system(.title3).bold()
|
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if intentRange.lowerBound != output.startIndex {
|
|
||||||
output.characters.insert(contentsOf: "\n\n", at: intentRange.lowerBound)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
self = output
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ReleaseNotesView: View {
|
struct ReleaseNotesView: View {
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationView {
|
NavigationView {
|
||||||
ScrollView {
|
ScrollView {
|
||||||
VStack(alignment: .leading, spacing: 16) {
|
VStack(alignment: .leading, spacing: 0) {
|
||||||
if let attributedString = loadReleaseNotes() {
|
if let markdownContent = loadReleaseNotes() {
|
||||||
Text(attributedString)
|
MarkdownContentView(content: markdownContent)
|
||||||
.textSelection(.enabled)
|
|
||||||
.padding()
|
.padding()
|
||||||
} else {
|
} else {
|
||||||
Text("Unable to load release notes")
|
Text("Unable to load release notes")
|
||||||
@ -71,13 +29,12 @@ struct ReleaseNotesView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func loadReleaseNotes() -> AttributedString? {
|
private func loadReleaseNotes() -> String? {
|
||||||
guard let url = Bundle.main.url(forResource: "RELEASE_NOTES", withExtension: "md"),
|
guard let url = Bundle.main.url(forResource: "RELEASE_NOTES", withExtension: "md"),
|
||||||
let markdownContent = try? String(contentsOf: url),
|
let markdownContent = try? String(contentsOf: url) else {
|
||||||
let attributedString = try? AttributedString(styledMarkdown: markdownContent) else {
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return attributedString
|
return markdownContent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user