Swiftlint format

home-assistant · Jan 7, 2017 · 30699ed · 30699ed
1 parent 12b102a
commit 30699ed
Show file tree

Hide file tree

Showing 14 changed files with 626 additions and 626 deletions.
diff --git a/HomeAssistant/AppDelegate.swift b/HomeAssistant/AppDelegate.swift
@@ -61,22 +61,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             }
             firstly {
                 HomeAssistantAPI.sharedInstance.Setup(baseAPIUrl: baseURL, APIPassword: apiPass)
-            }.then {_ in
-                HomeAssistantAPI.sharedInstance.Connect()
-            }.then { _ -> Void in
-                if HomeAssistantAPI.sharedInstance.notificationsEnabled {
-                    UIApplication.shared.registerForRemoteNotifications()
-                }
-                print("Connected!")
-                return
-            }.catch {err -> Void in
-                print("ERROR", err)
-//                let settingsView = SettingsViewController()
-//                settingsView.title = "Settings"
-//                settingsView.showErrorConnectingMessage = true
-//                let navController = UINavigationController(rootViewController: settingsView)
-//                self.window?.makeKeyAndVisible()
-//                self.window?.rootViewController!.present(navController, animated: true, completion: nil)
+                }.then {_ in
+                    HomeAssistantAPI.sharedInstance.Connect()
+                }.then { _ -> Void in
+                    if HomeAssistantAPI.sharedInstance.notificationsEnabled {
+                        UIApplication.shared.registerForRemoteNotifications()
+                    }
+                    print("Connected!")
+                    return
+                }.catch {err -> Void in
+                    print("ERROR", err)
+                    //                let settingsView = SettingsViewController()
+                    //                settingsView.title = "Settings"
+                    //                settingsView.showErrorConnectingMessage = true
+                    //                let navController = UINavigationController(rootViewController: settingsView)
+                    //                self.window?.makeKeyAndVisible()
+                    //                self.window?.rootViewController!.present(navController, animated: true, completion: nil)
             }
         }
     }
@@ -138,10 +138,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                     HomeAssistantAPI.sharedInstance.sendOneshotLocation().then { success -> Void in
                         print("Did successfully send location when requested via APNS?", success)
                         completionHandler(UIBackgroundFetchResult.noData)
-                    }.catch {error in
-                        print("Error when attempting to submit location update")
-                        Crashlytics.sharedInstance().recordError((error as Any) as! NSError)
-                        completionHandler(UIBackgroundFetchResult.failed)
+                        }.catch {error in
+                            print("Error when attempting to submit location update")
+                            Crashlytics.sharedInstance().recordError((error as Any) as! NSError)
+                            completionHandler(UIBackgroundFetchResult.failed)
                     }
                 default:
                     print("Received unknown command via APNS!", userInfo)
@@ -188,10 +188,10 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
         }
         HomeAssistantAPI.sharedInstance.handlePushAction(identifier: response.actionIdentifier, userInfo: response.notification.request.content.userInfo, userInput: userText).then { _ in
             completionHandler()
-        }.catch { err -> Void in
-            print("Error: \(err)")
-            Crashlytics.sharedInstance().recordError(err)
-            completionHandler()
+            }.catch { err -> Void in
+                print("Error: \(err)")
+                Crashlytics.sharedInstance().recordError(err)
+                completionHandler()
         }
     }
 

diff --git a/HomeAssistant/Classes/Entity.swift b/HomeAssistant/Classes/Entity.swift
@@ -48,7 +48,7 @@ class Entity: Object, StaticMappable {
     var UnitOfMeasurement: String?
     dynamic var LastChanged: Date? = nil
     dynamic var LastUpdated: Date? = nil
-//    let Groups = LinkingObjects(fromType: Group.self, property: "Entities")
+    //    let Groups = LinkingObjects(fromType: Group.self, property: "Entities")
 
     // Z-Wave properties
     dynamic var Location: String? = nil
@@ -130,8 +130,8 @@ class Entity: Object, StaticMappable {
         if let pic = self.Picture {
             HomeAssistantAPI.sharedInstance.getImage(imageUrl: pic).then { image -> Void in
                 self.DownloadedPicture = image
-            }.catch { err -> Void in
-                print("Error when attempting to download image", err)
+                }.catch { err -> Void in
+                    print("Error when attempting to download image", err)
             }
         }
     }

diff --git a/HomeAssistant/Classes/HA API Responses/Bootstrap.swift b/HomeAssistant/Classes/HA API Responses/Bootstrap.swift
@@ -10,11 +10,11 @@ import Foundation
 //class BootstrapResponse: Mappable {
 //    var Message: String?
 //    var IsOK: Bool?
-//    
+//
 //    required init?(_ map: Map){
-//        
+//
 //    }
-//    
+//
 //    func mapping(map: Map) {
 //        Message <- map["message"]
 //        IsOK    <- (map["message"] == "API running.")

diff --git a/HomeAssistant/Classes/HA API Responses/History.swift b/HomeAssistant/Classes/HA API Responses/History.swift
@@ -11,8 +11,8 @@ import ObjectMapper
 
 class HistoryResponse: Mappable {
 
-//    var EntityId: String?
-//    var Domain: String?
+    //    var EntityId: String?
+    //    var Domain: String?
     var Entities: [HistoryGroup]?
 
     required init?(map: Map) {
@@ -22,9 +22,9 @@ class HistoryResponse: Mappable {
     func mapping(map: Map) {
         print("map", map)
         Entities <- map
-//        EntityId <- map["message"]
-//        Domain    <- (map["message"] == "API running.")
-//        Events <- map[
+        //        EntityId <- map["message"]
+        //        Domain    <- (map["message"] == "API running.")
+        //        Events <- map[
     }
 }
 
@@ -33,11 +33,11 @@ class HistoryGroup: Mappable {
     var Events: [Entity]?
 
     required init?(map: Map) {
-                print("MAP", map)
+        print("MAP", map)
     }
 
     func mapping(map: Map) {
-                print("map", map)
+        print("map", map)
         Events <- map
         //        EntityId <- map["message"]
         //        Domain    <- (map["message"] == "API running.")