fix demo app warnings

This commit is contained in:
John Estropia
2017-11-09 19:27:05 +09:00
parent 8ce26c213d
commit 8a4d1cd7c6
2 changed files with 9 additions and 9 deletions

View File

@@ -32,9 +32,9 @@ struct ColorsDemo {
switch self { switch self {
case .all: return Where(true) case .all: return .init()
case .light: return Palette.where({ $0.brightness >= 0.9 }) case .light: return (\Palette.brightness >= 0.9)
case .dark: return Palette.where({ $0.brightness <= 0.4 }) case .dark: return (\Palette.brightness <= 0.4)
} }
} }
} }
@@ -45,7 +45,7 @@ struct ColorsDemo {
self.palettes.refetch( self.palettes.refetch(
self.filter.whereClause(), self.filter.whereClause(),
Palette.orderBy(ascending: { $0.hue }) OrderBy<Palette>(.ascending(\.hue))
) )
} }
} }
@@ -74,9 +74,9 @@ struct ColorsDemo {
) )
) )
return ColorsDemo.stack.monitorSectionedList( return ColorsDemo.stack.monitorSectionedList(
From<Palette>(), From<Palette>()
SectionBy(Palette.keyPath({ $0.colorName })), .sectionBy(\.colorName)
Palette.orderBy(ascending: { $0.hue }) .orderBy(.ascending(\.hue))
) )
}() }()
} }

View File

@@ -50,7 +50,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
required init?(coder aDecoder: NSCoder) { required init?(coder aDecoder: NSCoder) {
if let palette = ColorsDemo.stack.fetchOne(From<Palette>(), Palette.orderBy(ascending: { $0.hue })) { if let palette = ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue))) {
self.monitor = ColorsDemo.stack.monitorObject(palette) self.monitor = ColorsDemo.stack.monitorObject(palette)
} }
@@ -64,7 +64,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
} }
) )
let palette = ColorsDemo.stack.fetchOne(From<Palette>(), Palette.orderBy(ascending: { $0.hue }))! let palette = ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue)))!
self.monitor = ColorsDemo.stack.monitorObject(palette) self.monitor = ColorsDemo.stack.monitorObject(palette)
} }