ColorSetを変更

[kcd/KCD.git] / KCD / AirPlanInfoView.swift

diff --git a/KCD/AirPlanInfoView.swift b/KCD/AirPlanInfoView.swift
index 81188f5..e1a1b15 100644 (file)
--- a/KCD/AirPlanInfoView.swift
+++ b/KCD/AirPlanInfoView.swift
@@ -13,19 +13,29 @@ final class AirPlanInfoView: NSTableCellView {
     enum Condition: Int {
         
         case normal = 1
+        
         case tired = 2
+        
         case bad = 3
     }
     
-    @IBOutlet var planNameVew: SlotItemLevelView!
-    @IBOutlet var conditionBox: NSBox!
-    @IBOutlet var needSupplyField: NSTextField!
+    static let conditionBindingName = NSBindingName(#keyPath(AirPlanInfoView.condition))
+    static let slotIDBindingName = NSBindingName(#keyPath(AirPlanInfoView.slotId))
+    static let maxCountBindingName = NSBindingName(#keyPath(AirPlanInfoView.maxCount))
+    static let countBindingName = NSBindingName(#keyPath(AirPlanInfoView.count))
+    
+    @IBOutlet private var planNameVew: SlotItemLevelView!
+    @IBOutlet private var conditionBox: NSBox!
+    @IBOutlet private var needSupplyField: NSTextField!
     
     @objc dynamic var condition: Int = 1 {
         
         didSet {
-            guard let cond = Condition(rawValue: condition)
-                else { return }
+            
+            guard let cond = Condition(rawValue: condition) else {
+                
+                return
+            }
             
             conditionBox.fillColor = conditionColor(cond)
             conditionBox.borderColor = borderColor(cond)
@@ -50,18 +60,26 @@ final class AirPlanInfoView: NSTableCellView {
     private func conditionColor(_ cond: Condition) -> NSColor {
         
         switch cond {
-        case .normal: return .clear
-        case .tired: return #colorLiteral(red: 1, green: 0.7233425379, blue: 0.1258574128, alpha: 0.8239436619)
-        case .bad: return #colorLiteral(red: 0.7320367694, green: 0.07731548697, blue: 0.06799335033, alpha: 1)
+            
+        case .normal: return ColorSetManager.current[.airPlanInforViewNormal]
+            
+        case .tired: return ColorSetManager.current[.airPlanInforViewTired]
+            
+        case .bad: return ColorSetManager.current[.airPlanInforViewBad]
+            
         }
     }
     
     private func borderColor(_ cond: Condition) -> NSColor {
         
         switch cond {
-        case .normal: return .clear
-        case .tired: return #colorLiteral(red: 0.458858192, green: 0.3335277438, blue: 0.07979661971, alpha: 1)
-        case .bad: return #colorLiteral(red: 0.5462518334, green: 0.04599834234, blue: 0.04913448542, alpha: 1)
+            
+        case .normal: return ColorSetManager.current[.airPlanInforViewBoarderNormal]
+            
+        case .tired: return ColorSetManager.current[.airPlanInforViewBoarderTired]
+            
+        case .bad: return ColorSetManager.current[.airPlanInforViewBoarderBad]
+            
         }
     }
     
@@ -77,25 +95,17 @@ final class AirPlanInfoView: NSTableCellView {
     
     deinit {
         
-        unbind(NSBindingName(#keyPath(AirPlanInfoView.condition)))
-        unbind(NSBindingName(#keyPath(AirPlanInfoView.slotId)))
-        unbind(NSBindingName(#keyPath(AirPlanInfoView.maxCount)))
-        unbind(NSBindingName(#keyPath(AirPlanInfoView.count)))
+        unbind(AirPlanInfoView.conditionBindingName)
+        unbind(AirPlanInfoView.slotIDBindingName)
+        unbind(AirPlanInfoView.maxCountBindingName)
+        unbind(AirPlanInfoView.countBindingName)
     }
     
     override func awakeFromNib() {
         
-        bind(NSBindingName(#keyPath(AirPlanInfoView.condition)),
-             to: self,
-             withKeyPath: "objectValue.cond")
-        bind(NSBindingName(#keyPath(AirPlanInfoView.slotId)),
-             to: self,
-             withKeyPath: "objectValue.slotid")
-        bind(NSBindingName(#keyPath(AirPlanInfoView.maxCount)),
-             to: self,
-             withKeyPath: "objectValue.max_count")
-        bind(NSBindingName(#keyPath(AirPlanInfoView.count)),
-             to: self,
-             withKeyPath: "objectValue.count")
+        bind(AirPlanInfoView.conditionBindingName, to: self, withKeyPath: "objectValue.cond")
+        bind(AirPlanInfoView.slotIDBindingName, to: self, withKeyPath: "objectValue.slotid")
+        bind(AirPlanInfoView.maxCountBindingName, to: self, withKeyPath: "objectValue.max_count")
+        bind(AirPlanInfoView.countBindingName, to: self, withKeyPath: "objectValue.count")
     }
 }