-
Notifications
You must be signed in to change notification settings - Fork 48
feat: optimize RichView styles to match Android app #80
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,7 +79,7 @@ public class MarkdownRenderer { | |
| attributedString.append(renderListItem(content, ordered: true, number: number)) | ||
| } else if line.starts(with: "---") { | ||
| // Horizontal rule | ||
| attributedString.append(AttributedString("—————————————\n")) | ||
| attributedString.append(renderHorizontalRule()) | ||
| } else if line.starts(with: "|") && line.hasSuffix("|") { | ||
| // Markdown table | ||
| let (tableBlock, linesConsumed) = extractTableBlock(lines, startIndex: index) | ||
|
|
@@ -169,6 +169,17 @@ public class MarkdownRenderer { | |
| return attributed | ||
| } | ||
|
|
||
| // MARK: - Horizontal Rule Rendering | ||
|
|
||
| private func renderHorizontalRule() -> AttributedString { | ||
| var attributed = AttributedString("\n") | ||
| var line = AttributedString(String(repeating: "─", count: 40)) | ||
| line.foregroundColor = stylesheet.horizontalRule.color.uiColor | ||
| attributed.append(line) | ||
| attributed.append(AttributedString("\n\n")) | ||
| return attributed | ||
| } | ||
|
|
||
| // MARK: - List Rendering | ||
|
|
||
| private func renderListItem(_ text: String, ordered: Bool, number: Int) -> AttributedString { | ||
|
|
@@ -342,6 +353,66 @@ public class MarkdownRenderer { | |
| continue | ||
| } | ||
|
|
||
| // Check for underline (<u>text</u>) | ||
| if let underlineMatch = currentText.firstMatch(of: /<u>(.+?)<\/u>/) { | ||
| // Add text before underline | ||
| let beforeRange = currentText.startIndex..<underlineMatch.range.lowerBound | ||
| if !beforeRange.isEmpty { | ||
| result.append(renderPlainText(String(currentText[beforeRange]))) | ||
| } | ||
|
|
||
| // Add underlined text | ||
| var underlineText = AttributedString(String(underlineMatch.1)) | ||
| underlineText.font = .system(size: stylesheet.body.fontSize) | ||
| underlineText.foregroundColor = stylesheet.body.color.uiColor | ||
| underlineText.underlineStyle = .single | ||
| result.append(underlineText) | ||
|
|
||
| // Continue with remaining text | ||
| currentText = String(currentText[underlineMatch.range.upperBound...]) | ||
| continue | ||
| } | ||
|
|
||
| // Check for superscript (<sup>text</sup>) | ||
| if let supMatch = currentText.firstMatch(of: /<sup>(.+?)<\/sup>/) { | ||
| // Add text before superscript | ||
| let beforeRange = currentText.startIndex..<supMatch.range.lowerBound | ||
| if !beforeRange.isEmpty { | ||
| result.append(renderPlainText(String(currentText[beforeRange]))) | ||
| } | ||
|
|
||
| // Add superscript text (smaller font, baseline offset) | ||
| var supText = AttributedString(String(supMatch.1)) | ||
| supText.font = .system(size: stylesheet.body.fontSize * 0.7) | ||
| supText.foregroundColor = stylesheet.body.color.uiColor | ||
| supText.baselineOffset = stylesheet.body.fontSize * 0.3 | ||
| result.append(supText) | ||
|
|
||
| // Continue with remaining text | ||
| currentText = String(currentText[supMatch.range.upperBound...]) | ||
| continue | ||
| } | ||
|
|
||
| // Check for subscript (<sub>text</sub>) | ||
| if let subMatch = currentText.firstMatch(of: /<sub>(.+?)<\/sub>/) { | ||
| // Add text before subscript | ||
| let beforeRange = currentText.startIndex..<subMatch.range.lowerBound | ||
| if !beforeRange.isEmpty { | ||
| result.append(renderPlainText(String(currentText[beforeRange]))) | ||
| } | ||
|
|
||
| // Add subscript text (smaller font, negative baseline offset) | ||
| var subText = AttributedString(String(subMatch.1)) | ||
| subText.font = .system(size: stylesheet.body.fontSize * 0.7) | ||
| subText.foregroundColor = stylesheet.body.color.uiColor | ||
| subText.baselineOffset = -stylesheet.body.fontSize * 0.2 | ||
| result.append(subText) | ||
|
|
||
| // Continue with remaining text | ||
| currentText = String(currentText[subMatch.range.upperBound...]) | ||
| continue | ||
| } | ||
|
Comment on lines
+356
to
+414
|
||
|
|
||
| // No more special elements, add remaining text | ||
| result.append(renderPlainText(currentText)) | ||
| break | ||
|
|
@@ -432,15 +503,15 @@ public class MarkdownRenderer { | |
|
|
||
| // Apply header style for first row | ||
| if rowIndex == 0 { | ||
| cellText.font = .system(size: stylesheet.body.fontSize, weight: .semibold) | ||
| cellText.font = .system(size: stylesheet.body.fontSize, weight: stylesheet.table.headerFontWeight) | ||
| } | ||
|
|
||
| result.append(cellText) | ||
|
|
||
| // Add separator between cells | ||
| if cellIndex < row.count - 1 { | ||
| var separator = AttributedString(" │ ") | ||
| separator.foregroundColor = Color.gray.opacity(0.5) | ||
| separator.foregroundColor = stylesheet.table.separatorColor.uiColor | ||
| result.append(separator) | ||
| } | ||
| } | ||
|
|
@@ -450,7 +521,7 @@ public class MarkdownRenderer { | |
| // Add separator line after header | ||
| if rowIndex == 0 && rows.count > 1 { | ||
| var separatorLine = AttributedString(String(repeating: "─", count: 40) + "\n") | ||
| separatorLine.foregroundColor = Color.gray.opacity(0.3) | ||
| separatorLine.foregroundColor = stylesheet.table.separatorColor.uiColor | ||
| result.append(separatorLine) | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The horizontal rule character has been changed from "—" (em dash) to "─" (box drawing character), but the existing test in
MarkdownRendererTests.swiftline 290 still checks for "—". This will cause the test to fail. Consider updating the test to check for "─" instead.