move files

noppefoxwolf · May 6, 2024 · 11e8629 · 11e8629
1 parent 4f5dbad
commit 11e8629
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 63 deletions.
diff --git a/Sources/DAWNText2/Entity/NSTextContentStorageCoordinator.swift b/Sources/DAWNText2/Entity/NSTextContentStorageCoordinator.swift
@@ -0,0 +1,43 @@
+import UIKit
+
+final class NSTextContentStorageCoordinator: NSObject, NSTextContentStorageDelegate {
+    let traitCollection: UITraitCollection
+
+    init(traitCollection: UITraitCollection) {
+        self.traitCollection = traitCollection
+    }
+
+    func textContentStorage(_ textContentStorage: NSTextContentStorage, textParagraphWith range: NSRange) -> NSTextParagraph? {
+        var paragraphWithDisplayAttributes: NSTextParagraph? = nil
+        let originalText = textContentStorage.textStorage!.attributedSubstring(from: range)
+
+        paragraphWithDisplayAttributes = NSTextParagraph(
+            attributedString: originalText.colorResolved(traitCollection)
+        )
+        return paragraphWithDisplayAttributes
+    }
+}
+
+extension NSAttributedString {
+    fileprivate func colorResolved(_ traitCollection: UITraitCollection) -> NSAttributedString {
+        let attributedString = NSMutableAttributedString(attributedString: self)
+        let range = NSRange(location: 0, length: attributedString.length)
+        attributedString.enumerateAttributes(in: range) { attributes, range, _ in
+            if let color = attributes[.foregroundColor] as? UIColor {
+                attributedString.addAttribute(
+                    .foregroundColor,
+                    value: color.resolvedColor(with: traitCollection),
+                    range: range
+                )
+            } else {
+                // default text color
+                attributedString.addAttribute(
+                    .foregroundColor,
+                    value: UIColor.label.resolvedColor(with: traitCollection),
+                    range: range
+                )
+            }
+        }
+        return attributedString
+    }
+}
diff --git a/Sources/DAWNText2/Entity/NSTextLayoutManagerCoordinator.swift b/Sources/DAWNText2/Entity/NSTextLayoutManagerCoordinator.swift
@@ -0,0 +1,23 @@
+import UIKit
+
+final class NSTextLayoutManagerCoordinator: NSObject, NSTextLayoutManagerDelegate {
+    let tintColor: UIColor
+    let buttonShapesEnabled: Bool
+
+    init(tintColor: UIColor, buttonShapesEnabled: Bool) {
+        self.tintColor = tintColor
+        self.buttonShapesEnabled = buttonShapesEnabled
+    }
+
+    func textLayoutManager(
+        _ textLayoutManager: NSTextLayoutManager,
+        renderingAttributesForLink link: Any,
+        at location: any NSTextLocation,
+        defaultAttributes renderingAttributes: [NSAttributedString.Key : Any] = [:]
+    ) -> [NSAttributedString.Key : Any]? {
+        var defaultAttributes = renderingAttributes
+        defaultAttributes[.foregroundColor] = tintColor
+        defaultAttributes[.underlineStyle] = buttonShapesEnabled ? NSUnderlineStyle.single.rawValue : nil
+        return defaultAttributes
+    }
+}
diff --git a/Sources/DAWNText2/Entity/TextLayoutDataFactory.swift b/Sources/DAWNText2/Entity/TextLayoutDataFactory.swift
@@ -94,66 +94,3 @@ final class TextLayoutDataFactory {
     }
 }
 
-final class NSTextContentStorageCoordinator: NSObject, NSTextContentStorageDelegate {
-    let traitCollection: UITraitCollection
-
-    init(traitCollection: UITraitCollection) {
-        self.traitCollection = traitCollection
-    }
-
-    func textContentStorage(_ textContentStorage: NSTextContentStorage, textParagraphWith range: NSRange) -> NSTextParagraph? {
-        var paragraphWithDisplayAttributes: NSTextParagraph? = nil
-        let originalText = textContentStorage.textStorage!.attributedSubstring(from: range)
-
-        paragraphWithDisplayAttributes = NSTextParagraph(
-            attributedString: originalText.colorResolved(traitCollection)
-        )
-        return paragraphWithDisplayAttributes
-    }
-}
-
-final class NSTextLayoutManagerCoordinator: NSObject, NSTextLayoutManagerDelegate {
-    let tintColor: UIColor
-    let buttonShapesEnabled: Bool
-
-    init(tintColor: UIColor, buttonShapesEnabled: Bool) {
-        self.tintColor = tintColor
-        self.buttonShapesEnabled = buttonShapesEnabled
-    }
-
-    func textLayoutManager(
-        _ textLayoutManager: NSTextLayoutManager,
-        renderingAttributesForLink link: Any,
-        at location: any NSTextLocation,
-        defaultAttributes renderingAttributes: [NSAttributedString.Key : Any] = [:]
-    ) -> [NSAttributedString.Key : Any]? {
-        var defaultAttributes = renderingAttributes
-        defaultAttributes[.foregroundColor] = tintColor
-        defaultAttributes[.underlineStyle] = buttonShapesEnabled ? NSUnderlineStyle.single.rawValue : nil
-        return defaultAttributes
-    }
-}
-
-extension NSAttributedString {
-    func colorResolved(_ traitCollection: UITraitCollection) -> NSAttributedString {
-        let attributedString = NSMutableAttributedString(attributedString: self)
-        let range = NSRange(location: 0, length: attributedString.length)
-        attributedString.enumerateAttributes(in: range) { attributes, range, _ in
-            if let color = attributes[.foregroundColor] as? UIColor {
-                attributedString.addAttribute(
-                    .foregroundColor,
-                    value: color.resolvedColor(with: traitCollection),
-                    range: range
-                )
-            } else {
-                // default text color
-                attributedString.addAttribute(
-                    .foregroundColor,
-                    value: UIColor.label.resolvedColor(with: traitCollection),
-                    range: range
-                )
-            }
-        }
-        return attributedString
-    }
-}