buzzert/Xaibatsu-Control-Panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Swift5 warnings

Browse Source
This commit is contained in:
Charles Magahern
2019-10-13 00:19:23 -07:00
parent 51d0faf556
commit 241248b1b0
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
XIONControlPanel/Controllers/WemoServer.swift
View File

@@ -121,7 +121,7 @@ internal class WemoOperation : Operation
var baseURL: URL var baseURL: URL
var session: URLSession var session: URLSession
internal(set) var error: Error? fileprivate(set) var error: Error?
init(baseURL: URL, session: URLSession) init(baseURL: URL, session: URLSession)
{ {
@@ -150,7 +150,7 @@ internal class ConnectOperation : WemoOperation
internal class FetchDevicesOperation : WemoOperation internal class FetchDevicesOperation : WemoOperation
{ {
internal(set) var devices: [WemoDevice] = [] private(set) var devices: [WemoDevice] = []
override func main() override func main()
{ {

17
XIONControlPanel/Models/WemoDevice.swift
View File

@@ -61,17 +61,14 @@ class WemoDevice: Hashable
} }
} }
var hashValue: Int func hash(into hasher: inout Hasher)
{ {
var hash: Int = 0x0 hasher.combine(self.name)
hash ^= self.name.hash hasher.combine(self.host)
hash ^= self.host.hash hasher.combine(self.model)
hash ^= self.model.hash hasher.combine(self.state)
hash ^= self.state.hashValue hasher.combine(self.type)
hash ^= self.type.hashValue hasher.combine(self.serial)
hash ^= self.serial.hashValue
return hash
} }
} }

3
XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@@ -99,8 +99,9 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "ios-marketing",
"size" : "1024x1024", "size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "Icon-1024.png",
"scale" : "1x" "scale" : "1x"
} }
], ],

BIN
XIONControlPanel/SupportingFiles/Assets.xcassets/AppIcon.appiconset/Icon-1024.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 KiB

14
XIONControlPanel/SupportingFiles/Base.lproj/LaunchScreen.storyboard
View File

@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="ipad12_9rounded" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--View Controller--> <!--View Controller-->
@@ -14,9 +18,9 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/> <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>