diff --git a/XIONControlPanel/Controllers/WemoServer.swift b/XIONControlPanel/Controllers/WemoServer.swift index 9c74fb6..cb04233 100644 --- a/XIONControlPanel/Controllers/WemoServer.swift +++ b/XIONControlPanel/Controllers/WemoServer.swift @@ -121,7 +121,7 @@ internal class WemoOperation : Operation var baseURL: URL var session: URLSession - internal(set) var error: Error? + fileprivate(set) var error: Error? init(baseURL: URL, session: URLSession) { @@ -150,7 +150,7 @@ internal class ConnectOperation : WemoOperation internal class FetchDevicesOperation : WemoOperation { - internal(set) var devices: [WemoDevice] = [] + private(set) var devices: [WemoDevice] = [] override func main() { diff --git a/XIONControlPanel/Models/WemoDevice.swift b/XIONControlPanel/Models/WemoDevice.swift index 760bac6..e8c0849 100644 --- a/XIONControlPanel/Models/WemoDevice.swift +++ b/XIONControlPanel/Models/WemoDevice.swift @@ -61,17 +61,14 @@ class WemoDevice: Hashable } } - var hashValue: Int + func hash(into hasher: inout Hasher) { - var hash: Int = 0x0 - hash ^= self.name.hash - hash ^= self.host.hash - hash ^= self.model.hash - hash ^= self.state.hashValue - hash ^= self.type.hashValue - hash ^= self.serial.hashValue - - return hash + hasher.combine(self.name) + hasher.combine(self.host) + hasher.combine(self.model) + hasher.combine(self.state) + hasher.combine(self.type) + hasher.combine(self.serial) } } diff --git a/XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Contents.json b/XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Contents.json index d4e5755..e0fa86d 100644 --- a/XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -99,8 +99,9 @@ "scale" : "2x" }, { - "idiom" : "ios-marketing", "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-1024.png", "scale" : "1x" } ], diff --git a/XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Icon-1024.png new file mode 100644 index 0000000..cbbeb01 Binary files /dev/null and b/XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Icon-1024.png differ diff --git a/XIONControlPanel/SupportingFiles/Base.lproj/LaunchScreen.storyboard b/XIONControlPanel/SupportingFiles/Base.lproj/LaunchScreen.storyboard index da2fb86..bd36599 100644 --- a/XIONControlPanel/SupportingFiles/Base.lproj/LaunchScreen.storyboard +++ b/XIONControlPanel/SupportingFiles/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -14,9 +18,9 @@ - + - +