ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit H1, H2 to the H3 point size.

Browse Source
This commit is contained in:
Stefan Ceriu
2025-09-09 12:43:10 +03:00
committed by Doug
parent c1149e8f5c
commit 02462fb1a0
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/HTMLParsing/AttributedStringBuilderV2.swift
+1 -1
View File
@@ -116,7 +116,7 @@ struct AttributedStringBuilderV2: AttributedStringBuilderProtocol {
switch tag { switch tag {
case "h1", "h2", "h3", "h4", "h5", "h6": case "h1", "h2", "h3", "h4", "h5", "h6":
let level = Int(String(tag.dropFirst())) ?? 1 let level = max(3, Int(String(tag.dropFirst())) ?? 1)
let size: CGFloat = UIFont.systemFontSize + CGFloat(6 - level) * 2 let size: CGFloat = UIFont.systemFontSize + CGFloat(6 - level) * 2
content = attributedString(from: childElement, preserveFormatting: preserveFormatting, listTag: listTag, listIndex: &childIndex, indentLevel: indentLevel) content = attributedString(from: childElement, preserveFormatting: preserveFormatting, listTag: listTag, listIndex: &childIndex, indentLevel: indentLevel)
content.setFontPreservingSymbolicTraits(UIFont.boldSystemFont(ofSize: size)) content.setFontPreservingSymbolicTraits(UIFont.boldSystemFont(ofSize: size))
UnitTests/Sources/AttributedStringBuilderTests.swift
+8 -2
View File
@@ -35,7 +35,7 @@ class AttributedStringBuilderV1Tests: XCTestCase {
XCTAssertEqual(attributedString.runs.count, 11) // newlines hold no attributes XCTAssertEqual(attributedString.runs.count, 11) // newlines hold no attributes
let pointSizes = attributedString.runs.compactMap(\.uiKit.font?.pointSize) let pointSizes = attributedString.runs.compactMap(\.uiKit.font?.pointSize)
XCTAssertEqual(pointSizes, [24, 22, 20, 18, 16, 14]) XCTAssertEqual(pointSizes, [23, 23, 23, 21, 19, 17])
} else { } else {
XCTAssert(attributedString.runs.count == 6) XCTAssert(attributedString.runs.count == 6)
@@ -173,7 +173,13 @@ class AttributedStringBuilderV1Tests: XCTestCase {
return return
} }
if !AttributedStringBuilder.useNextGenHTMLParser { if AttributedStringBuilder.useNextGenHTMLParser {
XCTAssertEqual(h1Font, h2Font)
XCTAssertEqual(h2Font, h3Font)
XCTAssert(h1Font.pointSize > UIFont.preferredFont(forTextStyle: .body).pointSize)
XCTAssert(h1Font.pointSize <= 23)
} else {
XCTAssertEqual(h1Font, h2Font) XCTAssertEqual(h1Font, h2Font)
XCTAssertEqual(h2Font, h3Font) XCTAssertEqual(h2Font, h3Font)