Merged PR 6923: Fix italic and bold in treatment perspective

Fix italic and bold in treatment perspective

Related work items: #58902, #59162

Author: Roel Spruit

Sources/ENCore/Resources/DefaultTreatmentPerspective.json

@@ -6,9 +6,9 @@
             "next_steps_title": "What can you do now?",
             "next_steps_body": "<ul><li>Stay home up to and including {StayHomeUntilDate} and look out for symptoms related to the coronavirus</li><li>Do you have (mild) symptoms related to the coronavirus? Get tested for coronavirus and stay home up to and including {StayHomeUntilDate}</li><li>Serious symptoms like high fever or difficulty breathing? Or part of a high-risk group and having a fever? Call your doctor</li></ul>\nWere you called by the GGD? Follow the advice given by the GGD, not the advice given by the app.",
             "stay_home_title": "Stay home up to and including {StayHomeUntilDate}",
-            "stay_home_body": "<ul><li>Ask someone else to get groceries. Is this impossible and are you free of symptoms? Then it's alright if you quickly go to the shop. Keep a 1,5 metre distance and don't touch anyone.</li><li>You're allowed to enjoy your own yard or balcony.</li><li>Children under the age of 18 are allowed to go to school and/or play sports.</li></ul>",
+            "stay_home_body": "<ul><li>Ask someone else to get groceries. Is this impossible and are you free of symptoms? Then it's alright if you quickly go to the shop. Keep a 1.5 metre distance and don't touch anyone.</li><li>You're allowed to enjoy your own yard or balcony.</li><li>Children under the age of 18 are allowed to go to school and/or play sports.</li></ul>",
             "no_visitors_title": "Don't see visitors",
-            "no_visitors_body": "Only the people who live with you are allowed to be in the same house as you. Stay away from each other and keep a 1,5 metre distance. That means no cuddling, no kissing and no sex.",
+            "no_visitors_body": "Only the people who live with you are allowed to be in the same house as you. Stay away from each other and keep a 1.5 metre distance. That means no cuddling, no kissing and no sex.",
             "medical_help_title": "Do you need medical help?",
             "medical_help_body": "<ul><li>Don't go to see your doctor or go to the hospital, but call your doctor first. Tell them you've been in contact with someone who has coronavirus.</li><li>Your doctor and other medical personnel are allowed to visit you.</li></ul>",
             "after_stay_home_title": "After {StayHomeUntilDate}",

Sources/ENCoreTests/App/Features/Notifications/Message/MessageViewControllerTests.swift

@@ -104,10 +104,10 @@ final class MessageViewControllerTests: TestCase {
     private lazy var fakeMessageWithListAndText: LocalizedTreatmentPerspective = {
         LocalizedTreatmentPerspective(paragraphs: [
             .init(title: "Paragraph Title",
-                  body: .htmlWithBulletList(text: "<b>Intro text</b>.\\n\\n<i>Second intro</i>.\\n\\n<ul><li>List Item 1</li><li>List Item 2</li></ul>\\nText below list", font: self.theme.fonts.body, textColor: self.theme.colors.gray, theme: self.theme, textAlignment: .left),
+                  body: .htmlWithBulletList(text: "<b>Intro text</b>.\\n\\n<i>Second intro</i> and the text continue until it wraps around just check long lines.<ul><li>List Item 1 <b>bold</b></li><li>List Item 2 <i>italic</i></li></ul>\\nText below list", font: self.theme.fonts.body, textColor: self.theme.colors.gray, theme: self.theme, textAlignment: .left),
                   type: .paragraph),
             .init(title: "Paragraph Title",
-                  body: .htmlWithBulletList(text: "<b>Intro text</b>.\\n\\n<i>Second intro</i>.\\n\\n<ul><li>List Item 1</li><li>List Item 2</li></ul>\\nText below list", font: self.theme.fonts.body, textColor: self.theme.colors.gray, theme: self.theme, textAlignment: .left),
+                  body: .htmlWithBulletList(text: "<b>Intro text</b>.\\n\\n<i>Second intro</i>.\n\n<ul><li>List Item 1</li><li>List Item 2</li></ul>\\nText below list", font: self.theme.fonts.body, textColor: self.theme.colors.gray, theme: self.theme, textAlignment: .left),
                   type: .paragraph)
         ], quarantineDays: 10)
     }()

Sources/ENCoreTests/App/Features/Notifications/Message/__Snapshots__/MessageViewControllerTests/testSnapshotMessageViewController_rtl.1.png

@@ -55,30 +55,7 @@ public extension NSAttributedString {
 
             let fullRange = NSRange(location: 0, length: attributedTitle.length)
             attributedTitle.addAttributes(attributes, range: fullRange)
-
-            let boldFontDescriptor = font.fontDescriptor.withSymbolicTraits(.traitBold)
-            let boldFont = boldFontDescriptor.map { UIFont(descriptor: $0, size: font.pointSize) }
-
-            let italicFontDescriptor = font.fontDescriptor.withSymbolicTraits(.traitItalic)
-            let italicFont = italicFontDescriptor.map { UIFont(descriptor: $0, size: font.pointSize) }
-
-            // replace default font with desired font - maintain bold style if possible
-            attributedTitle.enumerateAttribute(.font, in: fullRange, options: []) { value, range, finished in
-                guard let currentFont = value as? UIFont else { return }
-
-                var newFont = font
-
-                if let italicFont = italicFont, currentFont.fontDescriptor.symbolicTraits.contains(.traitItalic) {
-                    newFont = italicFont
-                }
-
-                if let boldFont = boldFont, currentFont.fontDescriptor.symbolicTraits.contains(.traitBold) {
-                    newFont = boldFont
-                }
-
-                attributedTitle.removeAttribute(.font, range: range)
-                attributedTitle.addAttribute(.font, value: newFont, range: range)
-            }
+            attributedTitle.replaceBoldAndItalicAttributes(font: font)
 
             return attributedTitle
         }
@@ -109,10 +86,12 @@ public extension NSAttributedString {
             .components(separatedBy: "\n")
             .filter { $0.hasPrefix(bullet) }
             .forEach { line in
-                if let lineRange = textToFormat.string.range(of: line) {
-                    let attributedLine = makeBullet(line.replacingOccurrences(of: bullet, with: ""), theme: theme, font: font, textAlignment: textAlignment)
-                    textToFormat.replaceCharacters(in: NSRange(lineRange, in: line), with: attributedLine)
+                guard let lineRange = textToFormat.string.range(of: line) else {
+                    return
                 }
+                let attributedLine = NSMutableAttributedString(attributedString: textToFormat.attributedSubstring(from: NSRange(lineRange, in: line)))
+                attributedLine.reformatBulletPoint(font: font, theme: theme, textAlignment: textAlignment)
+                textToFormat.replaceCharacters(in: NSRange(lineRange, in: line), with: attributedLine)
             }
 
         return textToFormat.attributedStringByTrimmingCharacterSet(charSet: .whitespacesAndNewlines)
@@ -210,4 +189,62 @@ extension NSMutableAttributedString {
             range = (string as NSString).rangeOfCharacter(from: charSet, options: .backwards)
         }
     }
+
+    func replaceBoldAndItalicAttributes(font: UIFont) {
+
+        let fullRange = NSRange(location: 0, length: length)
+
+        let boldFontDescriptor = font.fontDescriptor.withSymbolicTraits(.traitBold)
+        let boldFont = boldFontDescriptor.map { UIFont(descriptor: $0, size: font.pointSize) }
+
+        let italicFontDescriptor = font.fontDescriptor.withSymbolicTraits(.traitItalic)
+        let italicFont = italicFontDescriptor.map { UIFont(descriptor: $0, size: font.pointSize) }
+
+        // replace default font with desired font - maintain bold style if possible
+        self.enumerateAttribute(.font, in: fullRange, options: []) { value, range, finished in
+            guard let currentFont = value as? UIFont else { return }
+
+            var newFont = font
+
+            if let italicFont = italicFont, currentFont.fontDescriptor.symbolicTraits.contains(.traitItalic) {
+                newFont = italicFont
+            }
+
+            if let boldFont = boldFont, currentFont.fontDescriptor.symbolicTraits.contains(.traitBold) {
+                newFont = boldFont
+            }
+
+            self.removeAttribute(.font, range: range)
+            self.addAttribute(.font, value: newFont, range: range)
+        }
+    }
+
+    func reformatBulletPoint(font: UIFont, theme: Theme, textAlignment: NSTextAlignment) {
+
+        let bullet = "\t•\t"
+
+        if let bulletRange = self.string.range(of: bullet) {
+
+            let bulletFont = font.withSize(10)
+            let bulletAttributes: [NSAttributedString.Key: Any] = [
+                .font: bulletFont,
+                .foregroundColor: theme.colors.primary,
+                .baselineOffset: (font.xHeight - bulletFont.xHeight) / 2
+            ]
+            let newBullet = NSMutableAttributedString(string: "\u{25CF}\t", attributes: bulletAttributes)
+            self.replaceCharacters(in: NSRange(bulletRange, in: self.string), with: newBullet)
+        }
+
+        let paragraphStyle = NSMutableParagraphStyle()
+        let nonOptions = [NSTextTab.OptionKey: Any]()
+        paragraphStyle.tabStops = [
+            NSTextTab(textAlignment: textAlignment, location: 16, options: nonOptions)
+        ]
+        paragraphStyle.defaultTabInterval = 16
+        paragraphStyle.headIndent = 16
+        paragraphStyle.alignment = textAlignment
+        paragraphStyle.paragraphSpacing = 5
+
+        self.addAttributes([NSAttributedString.Key.paragraphStyle: paragraphStyle], range: NSMakeRange(0, self.length))
+    }
 }