mirror of
https://github.com/home-assistant/iOS.git
synced 2026-04-27 17:49:28 -05:00
Update swift lint and format + appy fixes (#2585)
## Summary Swift lint and swiftformat are outdated. This PR does update those + applies the new formatting form swiftformat. There is 1 swift file with a manual change: `Sources/Vehicle/Templates/Areas/CarPlayAreasViewModel.swift`. This is done because `swiftlint` did create the following swiftlint error: `error: Cyclomatic Complexity Violation: Function should have complexity 10 or less; currently complexity is 11 (cyclomatic_complexity)`. Because it does change a lot of files the question is if we want to finetune the `swiftformat` rules. ## Screenshots No user facing changes. ## Link to pull request in Documentation repository NA ## Any other notes NA
This commit is contained in:
@@ -243,7 +243,7 @@ public class HomeAssistantAPI {
|
||||
// using a random file name so we always have one, see https://github.com/home-assistant/iOS/issues/1068
|
||||
.appendingPathComponent(UUID().uuidString, isDirectory: false)
|
||||
|
||||
if let downloadingURL = downloadingURL {
|
||||
if let downloadingURL {
|
||||
return url.appendingPathExtension(downloadingURL.pathExtension)
|
||||
} else {
|
||||
return url
|
||||
@@ -498,7 +498,7 @@ public class HomeAssistantAPI {
|
||||
case .zoneOnly:
|
||||
if updateType == .BeaconRegionEnter {
|
||||
update = .init(trigger: updateType, usingNameOf: zone)
|
||||
} else if let rawLocation = rawLocation {
|
||||
} else if let rawLocation {
|
||||
// note this is a different zone than the event - e.g. the zone may be the one we are exiting
|
||||
update = .init(trigger: updateType, usingNameOf: RLMZone.zone(of: rawLocation, in: server))
|
||||
} else {
|
||||
@@ -579,13 +579,13 @@ public class HomeAssistantAPI {
|
||||
var eventData: [String: Any] = sharedEventDeviceInfo
|
||||
eventData["actionName"] = identifier
|
||||
|
||||
if let category = category {
|
||||
if let category {
|
||||
eventData["categoryName"] = category
|
||||
}
|
||||
if let actionData = actionData {
|
||||
if let actionData {
|
||||
eventData["action_data"] = actionData
|
||||
}
|
||||
if let textInput = textInput {
|
||||
if let textInput {
|
||||
eventData["response_info"] = textInput
|
||||
eventData["textInput"] = textInput
|
||||
}
|
||||
@@ -602,10 +602,10 @@ public class HomeAssistantAPI {
|
||||
var eventData = [String: Any]()
|
||||
eventData["action"] = identifier
|
||||
|
||||
if let actionData = actionData {
|
||||
if let actionData {
|
||||
eventData["action_data"] = actionData
|
||||
}
|
||||
if let textInput = textInput {
|
||||
if let textInput {
|
||||
eventData["reply_text"] = textInput
|
||||
}
|
||||
|
||||
@@ -629,7 +629,7 @@ public class HomeAssistantAPI {
|
||||
actionID: String,
|
||||
source: ActionSource
|
||||
) -> (serviceDomain: String, serviceName: String, serviceData: [String: String]) {
|
||||
return (serviceDomain: "scene", serviceName: "turn_on", serviceData: ["entity_id": actionID])
|
||||
(serviceDomain: "scene", serviceName: "turn_on", serviceData: ["entity_id": actionID])
|
||||
}
|
||||
|
||||
public func tagEvent(
|
||||
@@ -780,7 +780,7 @@ public class HomeAssistantAPI {
|
||||
UpdateSensors(trigger: trigger, limitedTo: nil, location: location)
|
||||
}
|
||||
|
||||
internal func UpdateSensors(
|
||||
func UpdateSensors(
|
||||
trigger: LocationUpdateTrigger,
|
||||
limitedTo: [SensorProvider.Type]?,
|
||||
location: CLLocation? = nil
|
||||
|
||||
Reference in New Issue
Block a user