Doutakuを導入

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

diff --git a/KCD/PowerUpSupportViewController.swift b/KCD/PowerUpSupportViewController.swift
index 1ce76f8..ad88567 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?
     
@@ -40,7 +40,7 @@ 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 }
         
@@ -71,7 +71,7 @@ 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