Merge pull request #49 from Keeeeen/swift4

Convert to swift4

Example/Example/Base.lproj/LaunchScreen.storyboard

@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+ <device id="retina4_7" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
  <dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
  </dependencies>
  <scenes>
  <!--View Controller-->
@@ -13,10 +18,9 @@
  <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
  </layoutGuides>
  <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="375" height="667"/>
  <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <animations/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  </view>
  </viewController>
  <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

Example/Example/AppDelegate.swift → Example/Example/Source/AppDelegate.swift

@@ -9,45 +9,33 @@
 import UIKit
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-
+final class AppDelegate: UIResponder, UIApplicationDelegate {
  var window: UIWindow?
-
-
- func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
  // Override point for customization after application launch.
  return true
  }
-
- func applicationWillResignActive(application: UIApplication) {
+ 
+ func applicationWillResignActive(_ application: UIApplication) {
  // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
  // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
  }
-
- func applicationDidEnterBackground(application: UIApplication) {
+ 
+ func applicationDidEnterBackground(_ application: UIApplication) {
  // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
  // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
  }
-
- func applicationWillEnterForeground(application: UIApplication) {
+ 
+ func applicationWillEnterForeground(_ application: UIApplication) {
  // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
  }
-
- func applicationDidBecomeActive(application: UIApplication) {
+ 
+ func applicationDidBecomeActive(_ application: UIApplication) {
  // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
  }
-
- func applicationWillTerminate(application: UIApplication) {
+ 
+ func applicationWillTerminate(_ application: UIApplication) {
  // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
  }
 }
-
-func delay(delay:Double, closure:()->()) {
- dispatch_after(
- dispatch_time(
- DISPATCH_TIME_NOW,
- Int64(delay * Double(NSEC_PER_SEC))
- ),
- dispatch_get_main_queue(), closure)
-}
-

Example/Example/CustomCell.swift → Example/Example/Source/View/CustomCell.swift

@@ -11,7 +11,7 @@ import UIKit
 class CustomCell: Cell, CellType {
  typealias CellModel = CustomCellModel
 
- @IBOutlet weak var titleLabel: Label!
+ @IBOutlet weak var titleLabel: UILabel!
 
  override func configure() {
  guard let cellmodel = cellmodel else {
@@ -20,9 +20,4 @@ class CustomCell: Cell, CellType {
 
  titleLabel.text = cellmodel.title + "(\(cellmodel.indexPath.section),\(cellmodel.indexPath.row))"
  }
-
- override func willDisplay(tableView: UITableView) {
- super.willDisplay(tableView)
-
- }
 }

Example/Example/CustomCell.xib → Example/Example/Source/View/CustomCell.xib

@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1509" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+ <device id="retina4_7" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
  <dependencies>
  <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
  </dependencies>
  <objects>
  <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -11,13 +15,13 @@
  <rect key="frame" x="0.0" y="0.0" width="320" height="53"/>
  <autoresizingMask key="autoresizingMask"/>
  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Yg9-fY-9K6" id="Nkn-4U-4HG">
- <rect key="frame" x="0.0" y="0.0" width="320" height="53"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="52.5"/>
  <autoresizingMask key="autoresizingMask"/>
  <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="1Yt-G9-XLh" customClass="Label" customModule="Example" customModuleProvider="target">
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="1Yt-G9-XLh">
  <rect key="frame" x="16" y="12" width="288" height="29"/>
  <fontDescription key="fontDescription" type="system" pointSize="16"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  <nil key="highlightedColor"/>
  </label>
  </subviews>
@@ -29,7 +33,7 @@
  </constraints>
  </tableViewCellContentView>
  <connections>
- <outlet property="titleLabel" destination="1Yt-G9-XLh" id="oD2-cj-wKu"/>
+ <outlet property="titleLabel" destination="1Yt-G9-XLh" id="9I7-MW-cp7"/>
  </connections>
  <point key="canvasLocation" x="506" y="282.5"/>
  </tableViewCell>

Example/Example/CustomHeaderView.swift → Example/Example/Source/View/CustomHeaderView.swift

@@ -15,14 +15,12 @@ final class CustomHeaderView: HeaderFooterView, HeaderFooterViewType {
  @IBOutlet weak var floatingLabel: UILabel!
 
  override func configure() {
- guard let vm = viewmodel else {
- return
- }
+ guard let vm = viewmodel else { return }
 
  label.text = vm.text
  }
 
- override func didChangeFloatingState(isFloating: Bool, section: Int) {
+ override func didChangeFloatingState(_ isFloating: Bool, section: Int) {
  super.didChangeFloatingState(isFloating, section: section)
 
  let title = isFloating ? "F \(section)" : "n \(section)"

Example/Example/CustomHeaderView.xib → Example/Example/Source/View/CustomHeaderView.xib

@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1509" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+ <device id="retina4_7" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
  <dependencies>
  <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
  </dependencies>
  <objects>
  <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -14,13 +18,13 @@
  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yp4-A8-hUs">
  <rect key="frame" x="20" y="0.0" width="381" height="65"/>
  <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  <nil key="highlightedColor"/>
  </label>
  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KYU-bO-CSa">
  <rect key="frame" x="401" y="0.0" width="90" height="65"/>
  <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  <nil key="highlightedColor"/>
  </label>
  </subviews>

Example/Example/CustomCellModel.swift → Example/Example/Source/View/Model/CustomCellModel.swift

@@ -11,8 +11,9 @@ import Foundation
 class CustomCellModel: CellModel {
  let title: String
 
- init(title: String, selectionHandler: SelectionHandler) {
+ init(title: String, selectionHandler: @escaping (Cell) -> Void) {
  self.title = title
+
  super.init(cell: CustomCell.self, selectionHandler: selectionHandler)
  }
 }

Example/Example/CustomHeaderViewModel.swift → Example/Example/Source/View/Model/CustomHeaderViewModel.swift

@@ -15,4 +15,4 @@ final class CustomHeaderViewModel: HeaderFooterViewModel {
  self.text = text
  super.init(view: CustomHeaderView.self)
  }
-}
+}