colorLiteralを採用

diff --git a/KCD/DamageView.swift b/KCD/DamageView.swift
index 89db728..2566c1e 100644 (file)
--- a/KCD/DamageView.swift
+++ b/KCD/DamageView.swift
@@ -33,7 +33,7 @@ class DamageView: NSView {
         case .none:
             return nil
         case .slightly:
-            return NSColor(calibratedRed: 1.00, green: 0.956, blue: 0.012, alpha: 0.5)
+            return #colorLiteral(red: 1.000, green: 0.956, blue: 0.012, alpha: 1)
         case .modest:
             return NSColor.orange.withAlphaComponent(0.5)
         case .badly:

diff --git a/KCD/SlotItemLevelView.swift b/KCD/SlotItemLevelView.swift
index c32cdaf..2213273 100644 (file)
--- a/KCD/SlotItemLevelView.swift
+++ b/KCD/SlotItemLevelView.swift
@@ -167,7 +167,7 @@ class SlotItemLevelView: NSTextField {
         return NSFont.monospacedDigitSystemFont(ofSize: NSFont.smallSystemFontSize(), weight: NSFontWeightRegular)
     }
     private var levelColor: NSColor {
-        return NSColor(calibratedRed: 0.135, green: 0.522, blue: 0.619, alpha: 1.0)
+        return #colorLiteral(red: 0.135, green: 0.522, blue: 0.619, alpha: 1)
     }
     
     // MARK: - Function
@@ -220,8 +220,8 @@ class SlotItemLevelView: NSTextField {
     }
     private func colorForALevel(level: Int) -> NSColor? {
         switch level {
-        case 1, 2, 3: return NSColor(calibratedRed: 0.257, green: 0.523, blue: 0.643, alpha: 1.0)
-        case 4, 5, 6, 7: return NSColor(calibratedRed: 0.784, green: 0.549, blue: 0.0, alpha: 1.0)
+        case 1, 2, 3: return #colorLiteral(red: 0.257, green: 0.523, blue: 0.643, alpha: 1)
+        case 4, 5, 6, 7: return #colorLiteral(red: 0.784, green: 0.549, blue: 0.000, alpha: 1)
         default: return nil
         }
     }
@@ -229,7 +229,7 @@ class SlotItemLevelView: NSTextField {
         switch level {
         case 1, 2, 3:
             let shadow = NSShadow()
-            shadow.shadowColor = NSColor(calibratedRed: 0.095, green: 0.364, blue: 0.917, alpha: 1.0)
+            shadow.shadowColor = #colorLiteral(red: 0.095, green: 0.364, blue: 0.917, alpha: 1)
             shadow.shadowBlurRadius = 4.0
             return shadow
         case 4, 5, 6, 7:

diff --git a/KCD/UserDefaultsExtension.swift b/KCD/UserDefaultsExtension.swift
index a864c11..e363ca7 100644 (file)
--- a/KCD/UserDefaultsExtension.swift
+++ b/KCD/UserDefaultsExtension.swift
@@ -11,12 +11,12 @@ import Cocoa
 
 extension UserDefaults {
     
-    static var plan01Color: NSColor { return NSColor(calibratedRed: 0.000, green: 0.043, blue: 0.518, alpha: 1.0) }
-    static var plan02Color: NSColor { return NSColor(calibratedRed: 0.800, green: 0.223, blue: 0.000, alpha: 1.0) }
-    static var plan03Color: NSColor { return NSColor(calibratedRed: 0.539, green: 0.012, blue: 0.046, alpha: 1.0) }
-    static var plan04Color: NSColor { return NSColor(calibratedRed: 0.000, green: 0.535, blue: 0.535, alpha: 1.0) }
-    static var plan05Color: NSColor { return NSColor(calibratedRed: 0.376, green: 0.035, blue: 0.535, alpha: 1.0) }
-    static var plan06Color: NSColor { return NSColor(calibratedRed: 0.535, green: 0.535, blue: 0.000, alpha: 1.0) }
+    static var plan01Color: NSColor { return #colorLiteral(red: 0.000, green: 0.043, blue: 0.518, alpha: 1) }
+    static var plan02Color: NSColor { return #colorLiteral(red: 0.800, green: 0.223, blue: 0.000, alpha: 1) }
+    static var plan03Color: NSColor { return #colorLiteral(red: 0.539, green: 0.012, blue: 0.046, alpha: 1) }
+    static var plan04Color: NSColor { return #colorLiteral(red: 0.000, green: 0.535, blue: 0.535, alpha: 1) }
+    static var plan05Color: NSColor { return #colorLiteral(red: 0.376, green: 0.035, blue: 0.535, alpha: 1) }
+    static var plan06Color: NSColor { return #colorLiteral(red: 0.535, green: 0.535, blue: 0.000, alpha: 1) }
     
     func keyedArchivedObject(forKey key: String) -> Any? {
         guard let data = object(forKey: key) as? Data else { return nil }