Move some content group and styles to FormattableContentKit

Modules/Package.swift

@@ -77,7 +77,18 @@ let package = Package(
             resources: [.process("Resources")],
             swiftSettings: [.swiftLanguageMode(.v5)]
         ),
-        .target(name: "FormattableContentKit", dependencies: ["WordPressShared"]),
+        .target(
+            name: "FormattableContentKit",
+            dependencies: [
+                "WordPressShared",
+                "WordPressUI",
+                .product(name: "Gridicons", package: "Gridicons-iOS"),
+                // TODO: Remove — It's here just for a NSMutableParagraphStyle init helper
+                .product(name: "WordPressKit", package: "WordPressKit-iOS"),
+            ],
+            // Set to v5 to avoid @Sendable warnings and errors
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .target(name: "JetpackStatsWidgetsCore", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(
             name: "ShareExtensionCore",

Modules/Sources/FormattableContentKit/Groups/HeaderContentGroup.swift

@@ -0,0 +1 @@
+public class HeaderContentGroup: FormattableContentGroup {}

Modules/Sources/FormattableContentKit/Groups/SubjectContentGroup.swift

@@ -0,0 +1 @@
+public class SubjectContentGroup: FormattableContentGroup {}

Modules/Sources/FormattableContentKit/Styles/SnippetsContentStyles.swift

@@ -0,0 +1,27 @@
+import WordPressShared
+
+public class SnippetsContentStyles: FormattableContentStyles {
+    public var attributes: [NSAttributedString.Key: Any] {
+        return WPStyleGuide.Notifications.snippetRegularStyle
+    }
+
+    public var quoteStyles: [NSAttributedString.Key: Any]?
+
+    public var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]?
+
+    public var linksColor: UIColor?
+
+    public var key: String
+
+    public init(
+        quoteStyles: [NSAttributedString.Key: Any]? = nil,
+        rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? = nil,
+        linksColor: UIColor? = nil,
+        key: String = "SnippetsContentStyles"
+    ) {
+        self.quoteStyles = quoteStyles
+        self.rangeStylesMap = rangeStylesMap
+        self.linksColor = linksColor
+        self.key = key
+    }
+}

WordPress/Classes/ViewRelated/Notifications/FormattableContent/Styles/SubjectContentStyles.swift → Modules/Sources/FormattableContentKit/Styles/SubjectContentStyles.swift

@@ -1,16 +1,15 @@
 import WordPressShared
-import FormattableContentKit
 
-class SubjectContentStyles: FormattableContentStyles {
-    var attributes: [NSAttributedString.Key: Any] {
+public class SubjectContentStyles: FormattableContentStyles {
+    public var attributes: [NSAttributedString.Key: Any] {
         return WPStyleGuide.Notifications.subjectRegularStyle
     }
 
-    var quoteStyles: [NSAttributedString.Key: Any]? {
+    public var quoteStyles: [NSAttributedString.Key: Any]? {
         return WPStyleGuide.Notifications.subjectItalicsStyle
     }
 
-    var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? {
+    public var rangeStylesMap: [FormattableRangeKind: [NSAttributedString.Key: Any]]? {
         return [
             .user: WPStyleGuide.Notifications.subjectRegularStyle,
             .post: WPStyleGuide.Notifications.subjectRegularStyle,
@@ -21,6 +20,11 @@ class SubjectContentStyles: FormattableContentStyles {
         ]
     }
 
-    var linksColor: UIColor? = nil
-    var key: String = "SubjectContentStyles"
+    public var linksColor: UIColor?
+    public var key: String
+
+    public init(linkColor: UIColor? = nil, key: String = "SubjectContentStyles") {
+        self.linksColor = linkColor
+        self.key = key
+    }
 }

WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift → Modules/Sources/FormattableContentKit/Styles/WPStyleGuide+Notifications.swift

@@ -1,7 +1,9 @@
+// FIXME: This does not belong here, see https://github.com/wordpress-mobile/WordPress-iOS/pull/24297
 import Foundation
-
 import Gridicons
+import UIKit
 import WordPressShared
+import WordPressKit // FIXME: Here just for the NSMutableParagraphStyle custom init
 import WordPressUI
 
 extension WPStyleGuide {
@@ -285,3 +287,29 @@ extension WPStyleGuide {
         fileprivate static let blockNoticonFont = subjectNoticonFont
     }
 }
+
+// FIXME: Duplicated move to appropriate location
+extension UIFont {
+    /// Returns a UIFont instance with the italic trait applied.
+    func italic() -> UIFont {
+        return withSymbolicTraits(.traitItalic)
+    }
+
+    /// Returns a UIFont instance with the semibold trait applied.
+    func semibold() -> UIFont {
+        return withWeight(.semibold)
+    }
+
+    private func withSymbolicTraits(_ traits: UIFontDescriptor.SymbolicTraits) -> UIFont {
+        guard let descriptor = fontDescriptor.withSymbolicTraits(traits) else {
+            return self
+        }
+
+        return UIFont(descriptor: descriptor, size: 0)
+    }
+
+    private func withWeight(_ weight: UIFont.Weight) -> UIFont {
+        let descriptor = fontDescriptor.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: weight]])
+        return UIFont(descriptor: descriptor, size: 0)
+    }
+}

WordPress/Classes/Models/Notifications/Notification.swift

@@ -63,7 +63,7 @@ class Notification: NSManagedObject {
     ///
     fileprivate var cachedTimestampAsDate: Date?
 
-    let formatter = FormattableContentFormatter()
+    private let formatter = FormattableContentFormatter()
 
     /// Subject Blocks Transient Storage.
     ///

WordPress/Classes/ViewRelated/Notifications/FormattableContent/Groups/HeaderContentGroup.swift

@@ -1,6 +1,6 @@
 import FormattableContentKit
 
-class HeaderContentGroup: FormattableContentGroup {
+extension HeaderContentGroup {
     class func createGroup(from header: [[String: AnyObject]], parent: Notification) -> FormattableContentGroup {
         let blocks = NotificationContentFactory.content(from: header, actionsParser: NotificationActionParser(), parent: parent)
         return FormattableContentGroup(blocks: blocks, kind: .header)

WordPress/Classes/ViewRelated/Notifications/FormattableContent/Groups/SubjectContentGroup.swift

@@ -1,6 +1,7 @@
 import FormattableContentKit
 
-class SubjectContentGroup: FormattableContentGroup {
+extension SubjectContentGroup {
+
     class func createGroup(from subject: [[String: AnyObject]], parent: Notification) -> FormattableContentGroup {
         let blocks = NotificationContentFactory.content(from: subject, actionsParser: NotificationActionParser(), parent: parent)
         return FormattableContentGroup(blocks: blocks, kind: .subject)

WordPress/Classes/ViewRelated/Notifications/Views/LikeUserTableViewCell.swift

@@ -1,4 +1,5 @@
 import Foundation
+import FormattableContentKit
 
 class LikeUserTableViewCell: UITableViewCell, NibReusable {