Fix comment colors

goranmoomin · Aug 25, 2020 · d03ccdd · d03ccdd
1 parent 6d75a07
commit d03ccdd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/HackerNews/Extensions/Atributika.swift b/HackerNews/Extensions/Atributika.swift
@@ -18,12 +18,13 @@ extension TagTransformer {
 }
 
 extension String {
-    var styledAttributedString: NSAttributedString {
+    func styledAttributedString(textColor: Color) -> NSAttributedString {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.paragraphSpacing = 8
         let systemFontSize = NSFont.systemFontSize(for: .regular)
         let all = Style
             .font(.systemFont(ofSize: systemFontSize))
+            .foregroundColor(textColor)
             .paragraphStyle(paragraphStyle)
         let a = Style("a")
         let i = Style("i")

diff --git a/HackerNews/Page/CommentCellView.swift b/HackerNews/Page/CommentCellView.swift
@@ -56,7 +56,14 @@ class CommentCellView: NSTableCellView {
             }
         }
         authorLabel.stringValue = comment.author
-        textLabel.attributedStringValue = comment.text.styledAttributedString
+        let textColor: NSColor
+        switch comment.color {
+        case .c00: textColor = .labelColor
+        case .c5a, .c73, .c82: textColor = .secondaryLabelColor
+        case .c88, .c9c, .cae: textColor = .tertiaryLabelColor
+        case .cbe, .cce, .cdd: textColor = .quaternaryLabelColor
+        }
+        textLabel.attributedStringValue = comment.text.styledAttributedString(textColor: textColor)
         creationLabel.stringValue = formatter.localizedString(for: comment.creation, relativeTo: Date())
     }
 

diff --git a/HackerNews/Page/ItemViewController.swift b/HackerNews/Page/ItemViewController.swift
@@ -30,7 +30,7 @@ class ItemViewController: NSViewController {
                     urlButton.isHidden = false
                     urlButton.title = host
                 } else if let text = story.content.text {
-                    textLabel.attributedStringValue = text.styledAttributedString
+                    textLabel.attributedStringValue = text.styledAttributedString(textColor: .labelColor)
                     textScrollView.isHidden = false
                     urlButton.isHidden = true
                 } else {