Add SwiftFormat to the project. (#129)

* Run swiftformat for whitespace.
* Run swiftformat with some rules.

ElementX/Sources/Services/Authentication/AuthenticationService.swift

@@ -15,7 +15,7 @@ class AuthenticationService: AuthenticationServiceProtocol {
     
     // MARK: Private
     
-    private(set) var homeserver: LoginHomeserver = LoginHomeserver(address: BuildSettings.defaultHomeserverURLString)
+    private(set) var homeserver = LoginHomeserver(address: BuildSettings.defaultHomeserverURLString)
     private let userSessionStore: UserSessionStoreProtocol
     
     // MARK: - Setup

ElementX/Sources/Services/Background/ApplicationProtocol.swift

@@ -21,4 +21,4 @@ protocol ApplicationProtocol {
     var applicationState: UIApplication.State { get }
 }
 
-extension UIApplication: ApplicationProtocol {}
+extension UIApplication: ApplicationProtocol { }

ElementX/Sources/Services/Background/BackgroundTaskServiceProtocol.swift

@@ -19,22 +19,22 @@ protocol BackgroundTaskServiceProtocol {
 extension BackgroundTaskServiceProtocol {
 
     func startBackgroundTask(withName name: String) -> BackgroundTaskProtocol? {
-        return startBackgroundTask(withName: name,
-                                   expirationHandler: nil)
+        startBackgroundTask(withName: name,
+                            expirationHandler: nil)
     }
 
     func startBackgroundTask(withName name: String,
                              isReusable: Bool) -> BackgroundTaskProtocol? {
-        return startBackgroundTask(withName: name,
-                                   isReusable: isReusable,
-                                   expirationHandler: nil)
+        startBackgroundTask(withName: name,
+                            isReusable: isReusable,
+                            expirationHandler: nil)
     }
 
     func startBackgroundTask(withName name: String,
                              expirationHandler: (() -> Void)?) -> BackgroundTaskProtocol? {
-        return startBackgroundTask(withName: name,
-                                   isReusable: false,
-                                   expirationHandler: expirationHandler)
+        startBackgroundTask(withName: name,
+                            isReusable: false,
+                            expirationHandler: expirationHandler)
     }
 
 }

ElementX/Sources/Services/Background/UIKitBackgroundTask.swift

@@ -15,16 +15,17 @@ class UIKitBackgroundTask: BackgroundTaskProtocol {
     var isRunning: Bool {
         identifier != .invalid
     }
+
     let isReusable: Bool
     let expirationHandler: BackgroundTaskExpirationHandler?
     var elapsedTime: TimeInterval {
-        return Date().timeIntervalSince(startDate) * 1000
+        Date().timeIntervalSince(startDate) * 1000
     }
 
     private let application: ApplicationProtocol
     private var identifier: UIBackgroundTaskIdentifier = .invalid
-    private var useCounter: Int = 0
-    private let startDate: Date = Date()
+    private var useCounter = 0
+    private let startDate = Date()
 
     /// Initializes and starts a new background task
     /// - Parameters:

ElementX/Sources/Services/Background/UIKitBackgroundTaskService.swift

@@ -35,7 +35,7 @@ class UIKitBackgroundTaskService: BackgroundTaskServiceProtocol {
             expirationHandler?()
             return nil
         }
-        var created: Bool = false
+        var created = false
         var result: BackgroundTaskProtocol?
 
         if isReusable {
@@ -47,10 +47,10 @@ class UIKitBackgroundTaskService: BackgroundTaskServiceProtocol {
                                                      isReusable: isReusable,
                                                      application: application,
                                                      expirationHandler: { [weak self] task in
-                    guard let self = self else { return }
-                    self.reusableTasks[task.name] = nil
-                    expirationHandler?()
-                }) {
+                                                         guard let self = self else { return }
+                                                         self.reusableTasks[task.name] = nil
+                                                         expirationHandler?()
+                                                     }) {
                     created = true
                     reusableTasks[name] = newTask
                     result = newTask
@@ -61,8 +61,8 @@ class UIKitBackgroundTaskService: BackgroundTaskServiceProtocol {
                                                  isReusable: isReusable,
                                                  application: application,
                                                  expirationHandler: { _ in
-                expirationHandler?()
-            }) {
+                                                     expirationHandler?()
+                                                 }) {
                 result = newTask
                 created = true
             }
@@ -85,8 +85,8 @@ class UIKitBackgroundTaskService: BackgroundTaskServiceProtocol {
     }
 
     private func avoidStartingNewTasks(for application: ApplicationProtocol) -> Bool {
-        if application.applicationState == .background
-            && application.backgroundTimeRemaining < .backgroundTimeRemainingThresholdToStartTasks {
+        if application.applicationState == .background,
+           application.backgroundTimeRemaining < .backgroundTimeRemainingThresholdToStartTasks {
             return true
         }
         return false

ElementX/Sources/Services/BugReport/BugReportService.swift

@@ -7,10 +7,10 @@
 //
 
 import Foundation
-import MatrixRustSDK
-import UIKit
 import GZIP
+import MatrixRustSDK
 import Sentry
+import UIKit
 
 enum BugReportServiceError: Error {
     case invalidBaseUrlString
@@ -33,7 +33,7 @@ class BugReportService: BugReportServiceProtocol {
         guard !sentryEndpoint.isEmpty else {
             throw BugReportServiceError.invalidSentryEndpoint
         }
-        self.baseURL = url
+        baseURL = url
         self.sentryEndpoint = sentryEndpoint
         self.applicationId = applicationId
         self.session = session
@@ -69,7 +69,7 @@ class BugReportService: BugReportServiceProtocol {
     // MARK: - BugReportServiceProtocol
 
     var crashedLastRun: Bool {
-        return SentrySDK.crashedLastRun
+        SentrySDK.crashedLastRun
     }
 
     func crash() {
@@ -182,8 +182,8 @@ class BugReportService: BugReportServiceProtocol {
             filesToCompress.append(URL(fileURLWithPath: crashLogFile))
         }
 
-        var totalSize: Int = 0
-        var totalZippedSize: Int = 0
+        var totalSize = 0
+        var totalZippedSize = 0
         var zippedFiles: [URL] = []
 
         for url in filesToCompress {

ElementX/Sources/Services/BugReport/MockBugReportService.swift

@@ -16,10 +16,10 @@ class MockBugReportService: BugReportServiceProtocol {
                          includeCrashLog: Bool,
                          githubLabels: [String],
                          files: [URL]) async throws -> SubmitBugReportResponse {
-        return SubmitBugReportResponse(reportUrl: "https://www.example/com/123")
+        SubmitBugReportResponse(reportUrl: "https://www.example/com/123")
     }
 
-    var crashedLastRun: Bool = false
+    var crashedLastRun = false
 
     func crash() {
         // no-op

ElementX/Sources/Services/BugReport/ScreenshotDetector.swift

@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import UIKit
 import Photos
+import UIKit
 
 enum ScreenshotDetectorError: String, Error {
     case loadFailed
@@ -18,7 +18,7 @@ enum ScreenshotDetectorError: String, Error {
 @MainActor
 class ScreenshotDetector {
 
-    var callback: (@MainActor (UIImage?, Error?) -> Void)?
+    var callback: (@MainActor(UIImage?, Error?) -> Void)?
 
     /// Flag to whether ask for photos authorization by default if needed.
     var autoRequestPHAuthorization = true
@@ -38,7 +38,7 @@ class ScreenshotDetector {
         let authStatus = PHPhotoLibrary.authorizationStatus(for: .readWrite)
         if authStatus == .authorized {
             findScreenshot()
-        } else if authStatus == .notDetermined && autoRequestPHAuthorization {
+        } else if authStatus == .notDetermined, autoRequestPHAuthorization {
             Task {
                 self.handleAuthStatus(await PHPhotoLibrary.requestAuthorization(for: .readWrite))
             }

ElementX/Sources/Services/Client/ClientProxy.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
+import Combine
 import Foundation
 import MatrixRustSDK
-import Combine
 import UIKit
 
 private class WeakClientProxyWrapper: ClientDelegate {
@@ -128,7 +128,7 @@ class ClientProxy: ClientProxyProtocol {
         Benchmark.endTrackingForIdentifier("ClientRooms", message: "Retrieved \(sdkRooms.count) rooms")
         
         Benchmark.startTrackingForIdentifier("ProcessingRooms", message: "Started processing \(sdkRooms.count) rooms")
-        let diff = sdkRooms.map({ $0.id() }).difference(from: currentRooms.map(\.id))
+        let diff = sdkRooms.map { $0.id() }.difference(from: currentRooms.map(\.id))
         
         for change in diff {
             switch change {

ElementX/Sources/Services/Client/ClientProxyProtocol.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
+import Combine
 import Foundation
 import MatrixRustSDK
-import Combine
 
 enum ClientProxyCallback {
     case updatedRoomsList

ElementX/Sources/Services/Media/MediaProvider.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import UIKit
 import Kingfisher
+import UIKit
 
 struct MediaProvider: MediaProviderProtocol {
     private let clientProxy: ClientProxyProtocol
@@ -21,7 +21,7 @@ struct MediaProvider: MediaProviderProtocol {
         self.clientProxy = clientProxy
         self.imageCache = imageCache
         self.backgroundTaskService = backgroundTaskService
-        self.processingQueue = DispatchQueue(label: "MediaProviderProcessingQueue", attributes: .concurrent)
+        processingQueue = DispatchQueue(label: "MediaProviderProcessingQueue", attributes: .concurrent)
     }
     
     func imageFromSource(_ source: MediaSource?) -> UIImage? {

ElementX/Sources/Services/Media/MediaSource.swift

@@ -23,6 +23,6 @@ struct MediaSource: Equatable {
     // MARK: - Equatable
     
     static func == (lhs: MediaSource, rhs: MediaSource) -> Bool {
-        return lhs.underlyingSource.url() == rhs.underlyingSource.url()
+        lhs.underlyingSource.url() == rhs.underlyingSource.url()
     }
 }

ElementX/Sources/Services/Media/MockMediaProvider.swift

@@ -12,18 +12,18 @@ import UIKit
 struct MockMediaProvider: MediaProviderProtocol {
     
     func imageFromSource(_ source: MediaSource?) -> UIImage? {
-        return nil
+        nil
     }
     
     func loadImageFromSource(_ source: MediaSource) async -> Result<UIImage, MediaProviderError> {
-        return .failure(.failedRetrievingImage)
+        .failure(.failedRetrievingImage)
     }
     
     func imageFromURLString(_ urlString: String?) -> UIImage? {
-        return nil
+        nil
     }
         
     func loadImageFromURLString(_ urlString: String) async -> Result<UIImage, MediaProviderError> {
-        return .failure(.failedRetrievingImage)
+        .failure(.failedRetrievingImage)
     }
 }

ElementX/Sources/Services/Room/Messages/EmoteRoomMessage.swift

@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import UIKit
 import MatrixRustSDK
+import UIKit
 
 struct EmoteRoomMessage: RoomMessageProtocol {
     private let message: MatrixRustSDK.EmoteMessage

ElementX/Sources/Services/Room/Messages/ImageRoomMessage.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import UIKit
 import MatrixRustSDK
+import UIKit
 
 struct ImageRoomMessage: RoomMessageProtocol {
     private let message: MatrixRustSDK.ImageMessage

ElementX/Sources/Services/Room/Messages/NoticeRoomMessage.swift

@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import UIKit
 import MatrixRustSDK
+import UIKit
 
 struct NoticeRoomMessage: RoomMessageProtocol {
     private let message: MatrixRustSDK.NoticeMessage

ElementX/Sources/Services/Room/Messages/TextRoomMessage.swift

@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import UIKit
 import MatrixRustSDK
+import UIKit
 
 struct TextRoomMessage: RoomMessageProtocol {
     private let message: MatrixRustSDK.TextMessage

ElementX/Sources/Services/Room/MockRoomProxy.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
+import Combine
 import Foundation
 import UIKit
-import Combine
 
 struct MockRoomProxy: RoomProxyProtocol {
     let id = UUID().uuidString
@@ -29,26 +29,24 @@ struct MockRoomProxy: RoomProxyProtocol {
     var callbacks = PassthroughSubject<RoomProxyCallback, Never>()
     
     func loadDisplayNameForUserId(_ userId: String) async -> Result<String?, RoomProxyError> {
-        return .failure(.failedRetrievingMemberDisplayName)
+        .failure(.failedRetrievingMemberDisplayName)
     }
     
     func loadAvatarURLForUserId(_ userId: String) async -> Result<String?, RoomProxyError> {
-        return .failure(.failedRetrievingMemberAvatarURL)
+        .failure(.failedRetrievingMemberAvatarURL)
     }
     
     func loadDisplayName() async -> Result<String, RoomProxyError> {
-        return .failure(.failedRetrievingDisplayName)
+        .failure(.failedRetrievingDisplayName)
     }
     
-    func startLiveEventListener() {
-        
-    }
+    func startLiveEventListener() { }
     
     func paginateBackwards(count: UInt) async -> Result<Void, RoomProxyError> {
-        return .failure(.backwardStreamNotAvailable)
+        .failure(.backwardStreamNotAvailable)
     }
         
     func sendMessage(_ message: String) async -> Result<Void, RoomProxyError> {
-        return .failure(.failedSendingMessage)
+        .failure(.failedSendingMessage)
     }
 }

ElementX/Sources/Services/Room/RoomProxy.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
+import Combine
 import Foundation
 import UIKit
-import Combine
 
 import MatrixRustSDK
 

ElementX/Sources/Services/Room/RoomProxyProtocol.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import UIKit
 import Combine
+import UIKit
 
 enum RoomProxyError: Error {
     case failedRetrievingDisplayName

ElementX/Sources/Services/Room/RoomSummary/MockRoomSummary.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import UIKit
 import Combine
+import UIKit
 
 struct MockRoomSummary: RoomSummaryProtocol {
     var id: String = UUID().uuidString
@@ -18,21 +18,19 @@ struct MockRoomSummary: RoomSummaryProtocol {
     
     var topic: String?
     
-    var isDirect: Bool = false
+    var isDirect = false
     
-    var isEncrypted: Bool = false
+    var isEncrypted = false
     
-    var isSpace: Bool = false
+    var isSpace = false
     
-    var isTombstoned: Bool = false
+    var isTombstoned = false
     
     var lastMessage: EventBrief?
     
     var avatar: UIImage?
     
-    func loadDetails() async {
-        
-    }
+    func loadDetails() async { }
     
     var callbacks = PassthroughSubject<RoomSummaryCallback, Never>()
 }

ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
+import Combine
 import Foundation
 import UIKit
-import Combine
 
 class RoomSummary: RoomSummaryProtocol {
     private let roomProxy: RoomProxyProtocol

ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProtocol.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import UIKit
 import Combine
+import UIKit
 
 enum RoomSummaryCallback {
     case updatedData

ElementX/Sources/Services/Session/UserSession.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 class UserSession: UserSessionProtocol {
     private var cancellables = Set<AnyCancellable>()

ElementX/Sources/Services/Session/UserSessionProtocol.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 enum UserSessionCallback {
     case sessionVerificationNeeded

ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift

@@ -6,14 +6,14 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
+import Combine
 import Foundation
 import MatrixRustSDK
-import Combine
 
 struct MockSessionVerificationControllerProxy: SessionVerificationControllerProxyProtocol {
     var callbacks = PassthroughSubject<SessionVerificationControllerProxyCallback, Never>()
     
-    var isVerified: Bool = false
+    var isVerified = false
     
     func requestVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
         DispatchQueue.global(qos: .background).asyncAfter(deadline: .now() + 2.0) {
@@ -50,13 +50,14 @@ struct MockSessionVerificationControllerProxy: SessionVerificationControllerProx
     // MARK: - Private
     
     static var emojis: [SessionVerificationEmoji] {
-        [SessionVerificationEmoji(symbol: "🦋", description: "Butterfly"),
-         SessionVerificationEmoji(symbol: "🐘", description: "Elephant"),
-         SessionVerificationEmoji(symbol: "🦋", description: "Butterfly"),
-         SessionVerificationEmoji(symbol: "🎂", description: "Cake"),
-         SessionVerificationEmoji(symbol: "🎂", description: "Cake"),
-         SessionVerificationEmoji(symbol: "🏁", description: "Flag"),
-         SessionVerificationEmoji(symbol: "🌏", description: "Globe")
+        [
+            SessionVerificationEmoji(symbol: "🦋", description: "Butterfly"),
+            SessionVerificationEmoji(symbol: "🐘", description: "Elephant"),
+            SessionVerificationEmoji(symbol: "🦋", description: "Butterfly"),
+            SessionVerificationEmoji(symbol: "🎂", description: "Cake"),
+            SessionVerificationEmoji(symbol: "🎂", description: "Cake"),
+            SessionVerificationEmoji(symbol: "🏁", description: "Flag"),
+            SessionVerificationEmoji(symbol: "🌏", description: "Globe")
         ]
     }
 }

ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxy.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
+import Combine
 import Foundation
 import MatrixRustSDK
-import Combine
 
 private class WeakSessionVerificationControllerProxy: SessionVerificationControllerDelegate {
     private weak var proxy: SessionVerificationControllerProxy?

ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxyProtocol.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 enum SessionVerificationControllerProxyError: Error {
     case failedRequestingVerification

ElementX/Sources/Services/Timeline/MockRoomTimelineController.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 class MockRoomTimelineController: RoomTimelineControllerProtocol {
     
@@ -40,18 +40,12 @@ class MockRoomTimelineController: RoomTimelineControllerProtocol {
                                                                           senderDisplayName: "Bob")]
     
     func paginateBackwards(_ count: UInt) async -> Result<Void, RoomTimelineControllerError> {
-        return .failure(.generic)
+        .failure(.generic)
     }
     
-    func processItemAppearance(_ itemId: String) async {
-        
-    }
+    func processItemAppearance(_ itemId: String) async { }
     
-    func processItemDisappearance(_ itemId: String) async {
-        
-    }
+    func processItemDisappearance(_ itemId: String) async { }
     
-    func sendMessage(_ message: String) async {
-        
-    }
+    func sendMessage(_ message: String) async { }
 }

ElementX/Sources/Services/Timeline/RoomTimelineController.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 import UIKit
 
 class RoomTimelineController: RoomTimelineControllerProtocol {
@@ -79,9 +79,7 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
         }
     }
     
-    func processItemDisappearance(_ itemId: String) {
-        
-    }
+    func processItemDisappearance(_ itemId: String) { }
     
     func sendMessage(_ message: String) async {
         switch await timelineProvider.sendMessage(message) {

ElementX/Sources/Services/Timeline/RoomTimelineControllerProtocol.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 enum RoomTimelineControllerCallback {
     case updatedTimelineItems

ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 class RoomTimelineProvider: RoomTimelineProviderProtocol {
     private let roomProxy: RoomProxyProtocol
@@ -21,13 +21,13 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
         self.roomProxy.callbacks
             .receive(on: DispatchQueue.main)
             .sink { [weak self] callback in
-            guard let self = self else { return }
+                guard let self = self else { return }
             
-            switch callback {
-            case .updatedMessages:
-                self.callbacks.send(.updatedMessages)
-            }
-        }.store(in: &cancellables)
+                switch callback {
+                case .updatedMessages:
+                    self.callbacks.send(.updatedMessages)
+                }
+            }.store(in: &cancellables)
     }
     
     var messages: [RoomMessageProtocol] {

ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Element. All rights reserved.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 enum RoomTimelineProviderCallback {
     case updatedMessages
@@ -26,5 +26,5 @@ protocol RoomTimelineProviderProtocol {
     
     func paginateBackwards(_ count: UInt) async -> Result<Void, RoomTimelineProviderError>
     
-    func sendMessage(_ message: String) async ->  Result<Void, RoomTimelineProviderError>
+    func sendMessage(_ message: String) async -> Result<Void, RoomTimelineProviderError>
 }

ElementX/Sources/Services/Timeline/TimelineItems/DecorationTimelineItemProtocol.swift

@@ -8,6 +8,4 @@
 
 import Foundation
 
-protocol DecorationTimelineItemProtocol: RoomTimelineItemProtocol {
-
-}
+protocol DecorationTimelineItemProtocol: RoomTimelineItemProtocol { }

ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift

@@ -42,6 +42,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
     }
     
     // MARK: - Private
+
     private func buildTextTimelineItemFromMessage(_ message: TextRoomMessage,
                                                   _ isOutgoing: Bool,
                                                   _ showSenderDetails: Bool,

ElementX/Sources/Services/UserSessionStore/UserSessionStore.swift

@@ -15,8 +15,8 @@
 //
 
 import Foundation
-import MatrixRustSDK
 import Kingfisher
+import MatrixRustSDK
 
 class UserSessionStore: UserSessionStoreProtocol {