Swift 2.0, Xcode7 changes and warnings fixed

Keyboard/CatboardBanner.swift

@@ -52,7 +52,9 @@ class CatboardBanner: ExtraView {
         self.updateAppearance()
     }
 
-    func updateAppearance() {
+    override func updateAppearance() {
+        super.updateAppearance()
+
         if self.catSwitch.on {
             self.catLabel.text = "😺"
             self.catLabel.alpha = 1

Keyboard/DefaultKeyboard.swift

@@ -7,81 +7,81 @@
 //
 
 func defaultKeyboard() -> Keyboard {
-    var defaultKeyboard = Keyboard()
+    let defaultKeyboard = Keyboard()
 
     for key in ["Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P"] {
-        var keyModel = Key(.Character)
+        let keyModel = Key(.Character)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 0, page: 0)
     }
 
     for key in ["A", "S", "D", "F", "G", "H", "J", "K", "L"] {
-        var keyModel = Key(.Character)
+        let keyModel = Key(.Character)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 1, page: 0)
     }
 
-    var keyModel = Key(.Shift)
+    let keyModel = Key(.Shift)
     defaultKeyboard.addKey(keyModel, row: 2, page: 0)
 
     for key in ["Z", "X", "C", "V", "B", "N", "M"] {
-        var keyModel = Key(.Character)
+        let keyModel = Key(.Character)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 2, page: 0)
     }
 
-    var backspace = Key(.Backspace)
+    let backspace = Key(.Backspace)
     defaultKeyboard.addKey(backspace, row: 2, page: 0)
 
-    var keyModeChangeNumbers = Key(.ModeChange)
+    let keyModeChangeNumbers = Key(.ModeChange)
     keyModeChangeNumbers.uppercaseKeyCap = "123"
     keyModeChangeNumbers.toMode = 1
     defaultKeyboard.addKey(keyModeChangeNumbers, row: 3, page: 0)
 
-    var keyboardChange = Key(.KeyboardChange)
+    let keyboardChange = Key(.KeyboardChange)
     defaultKeyboard.addKey(keyboardChange, row: 3, page: 0)
 
-    var settings = Key(.Settings)
+    let settings = Key(.Settings)
     defaultKeyboard.addKey(settings, row: 3, page: 0)
 
-    var space = Key(.Space)
+    let space = Key(.Space)
     space.uppercaseKeyCap = "space"
     space.uppercaseOutput = " "
     space.lowercaseOutput = " "
     defaultKeyboard.addKey(space, row: 3, page: 0)
 
-    var returnKey = Key(.Return)
+    let returnKey = Key(.Return)
     returnKey.uppercaseKeyCap = "return"
     returnKey.uppercaseOutput = "\n"
     returnKey.lowercaseOutput = "\n"
     defaultKeyboard.addKey(returnKey, row: 3, page: 0)
 
     for key in ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] {
-        var keyModel = Key(.SpecialCharacter)
+        let keyModel = Key(.SpecialCharacter)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 0, page: 1)
     }
 
     for key in ["-", "/", ":", ";", "(", ")", "$", "&", "@", "\""] {
-        var keyModel = Key(.SpecialCharacter)
+        let keyModel = Key(.SpecialCharacter)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 1, page: 1)
     }
 
-    var keyModeChangeSpecialCharacters = Key(.ModeChange)
+    let keyModeChangeSpecialCharacters = Key(.ModeChange)
     keyModeChangeSpecialCharacters.uppercaseKeyCap = "#+="
     keyModeChangeSpecialCharacters.toMode = 2
     defaultKeyboard.addKey(keyModeChangeSpecialCharacters, row: 2, page: 1)
 
     for key in [".", ",", "?", "!", "'"] {
-        var keyModel = Key(.SpecialCharacter)
+        let keyModel = Key(.SpecialCharacter)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 2, page: 1)
     }
 
     defaultKeyboard.addKey(Key(backspace), row: 2, page: 1)
 
-    var keyModeChangeLetters = Key(.ModeChange)
+    let keyModeChangeLetters = Key(.ModeChange)
     keyModeChangeLetters.uppercaseKeyCap = "ABC"
     keyModeChangeLetters.toMode = 0
     defaultKeyboard.addKey(keyModeChangeLetters, row: 3, page: 1)
@@ -95,21 +95,21 @@ func defaultKeyboard() -> Keyboard {
     defaultKeyboard.addKey(Key(returnKey), row: 3, page: 1)
 
     for key in ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="] {
-        var keyModel = Key(.SpecialCharacter)
+        let keyModel = Key(.SpecialCharacter)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 0, page: 2)
     }
 
     for key in ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "•"] {
-        var keyModel = Key(.SpecialCharacter)
+        let keyModel = Key(.SpecialCharacter)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 1, page: 2)
     }
 
     defaultKeyboard.addKey(Key(keyModeChangeNumbers), row: 2, page: 2)
 
     for key in [".", ",", "?", "!", "'"] {
-        var keyModel = Key(.SpecialCharacter)
+        let keyModel = Key(.SpecialCharacter)
         keyModel.setLetter(key)
         defaultKeyboard.addKey(keyModel, row: 2, page: 2)
     }

Keyboard/DefaultSettings.swift

@@ -16,12 +16,6 @@ class DefaultSettings: ExtraView, UITableViewDataSource, UITableViewDelegate {
     @IBOutlet var settingsLabel: UILabel?
     @IBOutlet var pixelLine: UIView?
 
-    override var darkMode: Bool {
-        didSet {
-            self.updateAppearance(darkMode)
-        }
-    }
-
     let cellBackgroundColorDark = UIColor.whiteColor().colorWithAlphaComponent(CGFloat(0.25))
     let cellBackgroundColorLight = UIColor.whiteColor().colorWithAlphaComponent(CGFloat(1))
     let cellLabelColorDark = UIColor.whiteColor()
@@ -62,16 +56,16 @@ class DefaultSettings: ExtraView, UITableViewDataSource, UITableViewDelegate {
         self.loadNib()
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         fatalError("loading from nib not supported")
     }
 
     func loadNib() {
         let assets = NSBundle(forClass: self.dynamicType).loadNibNamed("DefaultSettings", owner: self, options: nil)
 
         if assets.count > 0 {
-            if var rootView = assets.first as? UIView {
-                rootView.setTranslatesAutoresizingMaskIntoConstraints(false)
+            if let rootView = assets.first as? UIView {
+                rootView.translatesAutoresizingMaskIntoConstraints = false
                 self.addSubview(rootView)
 
                 let left = NSLayoutConstraint(item: rootView, attribute: NSLayoutAttribute.Left, relatedBy: NSLayoutRelation.Equal, toItem: self, attribute: NSLayoutAttribute.Left, multiplier: 1, constant: 0)
@@ -93,7 +87,7 @@ class DefaultSettings: ExtraView, UITableViewDataSource, UITableViewDelegate {
         // XXX: this is here b/c a totally transparent background does not support scrolling in blank areas
         self.tableView?.backgroundColor = UIColor.whiteColor().colorWithAlphaComponent(0.01)
 
-        self.updateAppearance(self.darkMode)
+        self.updateAppearance()
     }
 
     func numberOfSectionsInTableView(tableView: UITableView) -> Int {
@@ -122,7 +116,7 @@ class DefaultSettings: ExtraView, UITableViewDataSource, UITableViewDelegate {
     }
 
     func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
-        if var cell = tableView.dequeueReusableCellWithIdentifier("cell") as? DefaultSettingsTableViewCell {
+        if let cell = tableView.dequeueReusableCellWithIdentifier("cell") as? DefaultSettingsTableViewCell {
             let key = self.settingsList[indexPath.section].1[indexPath.row]
 
             if cell.sw.allTargets().count == 0 {
@@ -147,23 +141,23 @@ class DefaultSettings: ExtraView, UITableViewDataSource, UITableViewDelegate {
         }
     }
 
-    func updateAppearance(dark: Bool) {
-        if dark {
+    override func updateAppearance() {
+        super.updateAppearance()
+
+        if darkMode {
             self.effectsView?.effect
             let blueColor = UIColor(red: 135/CGFloat(255), green: 206/CGFloat(255), blue: 250/CGFloat(255), alpha: 1)
             self.pixelLine?.backgroundColor = blueColor.colorWithAlphaComponent(CGFloat(0.5))
             self.backButton?.setTitleColor(blueColor, forState: UIControlState.Normal)
             self.settingsLabel?.textColor = UIColor.whiteColor()
 
-            if let visibleCells = self.tableView?.visibleCells() {
+            if let visibleCells = self.tableView?.visibleCells {
                 for cell in visibleCells {
-                    if var cell = cell as? UITableViewCell {
-                        cell.backgroundColor = cellBackgroundColorDark
-                        var label = cell.viewWithTag(2) as? UILabel
-                        label?.textColor = cellLabelColorDark
-                        var longLabel = cell.viewWithTag(3) as? UITextView
-                        longLabel?.textColor = cellLongLabelColorDark
-                    }
+                    cell.backgroundColor = cellBackgroundColorDark
+                    let label = cell.viewWithTag(2) as? UILabel
+                    label?.textColor = cellLabelColorDark
+                    let longLabel = cell.viewWithTag(3) as? UITextView
+                    longLabel?.textColor = cellLongLabelColorDark
                 }
             }
         }
@@ -173,15 +167,13 @@ class DefaultSettings: ExtraView, UITableViewDataSource, UITableViewDelegate {
             self.backButton?.setTitleColor(blueColor, forState: UIControlState.Normal)
             self.settingsLabel?.textColor = UIColor.grayColor()
 
-            if let visibleCells = self.tableView?.visibleCells() {
+            if let visibleCells = self.tableView?.visibleCells {
                 for cell in visibleCells {
-                    if var cell = cell as? UITableViewCell {
-                        cell.backgroundColor = cellBackgroundColorLight
-                        var label = cell.viewWithTag(2) as? UILabel
-                        label?.textColor = cellLabelColorLight
-                        var longLabel = cell.viewWithTag(3) as? UITextView
-                        longLabel?.textColor = cellLongLabelColorLight
-                    }
+                    cell.backgroundColor = cellBackgroundColorLight
+                    let label = cell.viewWithTag(2) as? UILabel
+                    label?.textColor = cellLabelColorLight
+                    let longLabel = cell.viewWithTag(3) as? UITextView
+                    longLabel?.textColor = cellLongLabelColorLight
                 }
             }
         }
@@ -215,9 +207,9 @@ class DefaultSettingsTableViewCell: UITableViewCell {
 
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
-        self.sw.setTranslatesAutoresizingMaskIntoConstraints(false)
-        self.label.setTranslatesAutoresizingMaskIntoConstraints(false)
-        self.longLabel.setTranslatesAutoresizingMaskIntoConstraints(false)
+        self.sw.translatesAutoresizingMaskIntoConstraints = false
+        self.label.translatesAutoresizingMaskIntoConstraints = false
+        self.longLabel.translatesAutoresizingMaskIntoConstraints = false
 
         self.longLabel.text = nil
         self.longLabel.scrollEnabled = false
@@ -232,14 +224,14 @@ class DefaultSettingsTableViewCell: UITableViewCell {
         self.addSubview(self.label)
         self.addSubview(self.longLabel)
 
-        self.addConstraints()
+        self.setupConstraints()
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    func addConstraints() {
+    func setupConstraints() {
         let margin: CGFloat = 8
         let sideMargin = margin * 2
 
@@ -294,7 +286,7 @@ class DefaultSettingsTableViewCell: UITableViewCell {
         if hasLongText != self.constraintsSetForLongLabel {
             self.removeConstraints(self.cellConstraints)
             self.cellConstraints.removeAll()
-            self.addConstraints()
+            self.setupConstraints()
         }
     }
 }

Keyboard/DirectionEnum.swift

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Apple. All rights reserved.
 //
 
-enum Direction: Int, Printable {
+enum Direction: Int, CustomStringConvertible {
     case Left = 0
     case Down = 3
     case Right = 2

Keyboard/ExtraView.swift

@@ -11,7 +11,14 @@ import UIKit
 class ExtraView: UIView {
 
     var globalColors: GlobalColors.Type?
-    var darkMode: Bool
+    var darkMode: Bool {
+        didSet {
+            if oldValue != darkMode {
+                updateAppearance()
+            }
+        }
+    }
+
     var solidColorMode: Bool
 
     required init(globalColors: GlobalColors.Type?, darkMode: Bool, solidColorMode: Bool) {
@@ -22,11 +29,15 @@ class ExtraView: UIView {
         super.init(frame: CGRectZero)
     }
 
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
         self.globalColors = nil
         self.darkMode = false
         self.solidColorMode = false
 
         super.init(coder: aDecoder)
     }
+
+    func updateAppearance() {
+
+    }
 }