不要となっていたプロパティを削除

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

diff --git a/KCD/PowerUpSupportViewController.swift b/KCD/PowerUpSupportViewController.swift
index 1ce76f8..c4d084e 100644 (file)
--- a/KCD/PowerUpSupportViewController.swift
+++ b/KCD/PowerUpSupportViewController.swift
@@ -12,8 +12,8 @@ final class PowerUpSupportViewController: MainTabVIewItemViewController {
     
     @objc let managedObjectContext = ServerDataStore.default.context
     
-    @IBOutlet var shipController: NSArrayController!
-    @IBOutlet weak var typeSegment: NSSegmentedControl!
+    @IBOutlet private var shipController: NSArrayController!
+    @IBOutlet private weak var typeSegment: NSSegmentedControl!
     
     private var sortDescriptorsObservation: NSKeyValueObservation?
     
@@ -21,6 +21,7 @@ final class PowerUpSupportViewController: MainTabVIewItemViewController {
     override var selectedShipType: ShipTabType {
         
         didSet {
+            
             shipController.filterPredicate = customPredicate()
             shipController.rearrangeObjects()
         }
@@ -40,9 +41,12 @@ final class PowerUpSupportViewController: MainTabVIewItemViewController {
             .appended { (sd[.hideMaxTaiku], .false(#keyPath(Ship.isMaxTaiku))) }
             .appended { (sd[.hideMaxSoukou], .false(#keyPath(Ship.isMaxSoukou))) }
             .appended { (sd[.hideMaxLucky], .false(#keyPath(Ship.isMaxLucky))) }
-            .flatMap { (b, s) in b ? s : nil }
+            .compactMap { (b, s) in b ? s : nil }
         
-        if predicates.isEmpty { return nil }
+        if predicates.isEmpty {
+            
+            return nil
+        }
         
         return .and(predicates)
     }
@@ -71,12 +75,16 @@ final class PowerUpSupportViewController: MainTabVIewItemViewController {
     
     private func customPredicate() -> NSPredicate? {
         
-        switch (shipTypePredicte, omitPredicate) {
+        switch (shipTypePredicte(for: selectedShipType), omitPredicate) {
             
         case let (s?, o?): return .and([o, s])
+            
         case let (s?, nil): return s
+            
         case let (nil, o?): return o
+            
         default: return nil
+            
         }
     }