Removed NukeMe struct

Author: bummytime

WooCommerce/Classes/Tools/StringFormatter/StringStyles.swift

@@ -64,7 +64,7 @@ extension StringStyles {
         let bold: Style         = [.paragraphStyle: NSParagraphStyle.subheadline, .font: UIFont.subheadline.bold]
         let blockquote: Style   = [.paragraphStyle: NSParagraphStyle.subheadline, .font: UIFont.subheadline.italics]
         let italics: Style      = [.paragraphStyle: NSParagraphStyle.subheadline, .font: UIFont.subheadline.italics]
-        let noticon: Style      = [.paragraphStyle: NSParagraphStyle.subheadline, .font: UIFont.noticon(forStyle: .subheadline), .foregroundColor: NukeMe.subjectNoticonColor]
+        let noticon: Style      = [.paragraphStyle: NSParagraphStyle.subheadline, .font: UIFont.noticon(forStyle: .subheadline), .foregroundColor: StyleManager.defaultTextColor]
 
         return StringStyles(regular: regular, bold: bold, blockquote: blockquote, italics: italics, match: nil, noticon: noticon)
     }()
@@ -82,9 +82,9 @@ extension StringStyles {
     /// Styles: Notification Defailts / Header Block
     ///
     static let header: StringStyles = {
-        let regular: Style      = [.font: UIFont.body, .foregroundColor: NukeMe.bodyTextColor]
-        let bold: Style         = [.font: UIFont.body.bold, .foregroundColor: NukeMe.bodyTextColor]
-        let italics: Style      = [.font: UIFont.body.italics, .foregroundColor: NukeMe.headerItalicsColor]
+        let regular: Style      = [.font: UIFont.body, .foregroundColor: StyleManager.defaultTextColor]
+        let bold: Style         = [.font: UIFont.body.bold, .foregroundColor: StyleManager.defaultTextColor]
+        let italics: Style      = [.font: UIFont.body.italics, .foregroundColor: StyleManager.defaultTextColor]
 
         return StringStyles(regular: regular, bold: bold, italics: italics)
     }()
@@ -93,7 +93,7 @@ extension StringStyles {
     /// Styles: Notification Defailts / Footer Block
     ///
     static let footer: StringStyles = {
-        let regular: Style      = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body, .foregroundColor: NukeMe.footerTextColor]
+        let regular: Style      = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body, .foregroundColor: StyleManager.defaultTextColor]
 
         return StringStyles(regular: regular, noticon: body.noticon)
     }()
@@ -102,30 +102,14 @@ extension StringStyles {
     /// Styles: Notification Defailts / Body Blocks
     ///
     static let body: StringStyles = {
-        let regular: Style      = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body, .foregroundColor: NukeMe.bodyTextColor]
-        let bold: Style         = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.bold, .foregroundColor: NukeMe.bodyTextColor]
-        let blockquote: Style   = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.italics, .foregroundColor: NukeMe.bodyBlockquotedColor]
-        let match: Style        = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.bold, .foregroundColor: NukeMe.bodyLinkColor]
-        let noticon: Style      = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.noticon(forStyle: .body), .foregroundColor: NukeMe.bodyNoticonColor]
-        let italic: Style       = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.italics, .foregroundColor: NukeMe.bodyTextColor]
-        let link: Style         = [.foregroundColor: NukeMe.bodyLinkColor]
+        let regular: Style      = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body, .foregroundColor: StyleManager.defaultTextColor]
+        let bold: Style         = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.bold, .foregroundColor: StyleManager.defaultTextColor]
+        let blockquote: Style   = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.italics, .foregroundColor: StyleManager.defaultTextColor]
+        let match: Style        = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.bold, .foregroundColor: StyleManager.defaultTextColor]
+        let noticon: Style      = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.noticon(forStyle: .body), .foregroundColor: StyleManager.defaultTextColor]
+        let italic: Style       = [.paragraphStyle: NSParagraphStyle.body, .font: UIFont.body.italics, .foregroundColor: StyleManager.defaultTextColor]
+        let link: Style         = [.foregroundColor: StyleManager.defaultTextColor]
 
         return StringStyles(regular: regular, bold: bold, blockquote: blockquote, match: match, noticon: noticon, link: link)
     }()
 }
-
-
-// MARK: - TODO: Nuke this. Map the Colors, as required, from the StyleManager
-//
-private struct NukeMe {
-    static let subjectNoticonColor = UIColor.black
-
-    static let headerItalicsColor = UIColor.gray
-
-    static let bodyTextColor = UIColor.black
-    static let bodyBlockquotedColor = UIColor.black
-    static let bodyLinkColor = UIColor.black
-    static let bodyNoticonColor = UIColor.black
-
-    static let footerTextColor = UIColor.black
-}