Configured and applied SwiftFormat

RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/MatrixSDK/SpaceCreationSettingsService.swift

@@ -1,6 +1,6 @@
 // File created from TemplateAdvancedRoomsExample
 // $ createSwiftUITwoScreen.sh Spaces/SpaceCreation SpaceCreation SpaceCreationMenu SpaceCreationSettings
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,11 @@
 // limitations under the License.
 //
 
-import Foundation
 import Combine
+import Foundation
 import MatrixSDK
 
 class SpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
-    
     // MARK: - Properties
     
     var roomName: String {
@@ -30,6 +29,7 @@ class SpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
             updateAvatar()
         }
     }
+
     var userDefinedAddress: String? {
         didSet {
             validateAddress()
@@ -45,10 +45,12 @@ class SpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
             validateAddress()
         }
     }
-    private var lastValidatedAddress: String = ""
+
+    private var lastValidatedAddress = ""
     private var currentAddress: String? {
-        return self.userDefinedAddress?.count ?? 0 > 0 ? self.userDefinedAddress : defaultAddress
+        userDefinedAddress?.count ?? 0 > 0 ? userDefinedAddress : defaultAddress
     }
+
     private var currentOperation: MXHTTPOperation?
     
     // MARK: Public
@@ -69,14 +71,14 @@ class SpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
     
     init(roomName: String, userDefinedAddress: String?, session: MXSession) {
         self.session = session
-        self.defaultAddress = ""
-        self.defaultAddressSubject = CurrentValueSubject(defaultAddress)
+        defaultAddress = ""
+        defaultAddressSubject = CurrentValueSubject(defaultAddress)
         self.roomName = roomName
-        self.addressValidationSubject = CurrentValueSubject(.none("#"))
-        self.avatarViewDataSubject = CurrentValueSubject(AvatarInput(mxContentUri: userDefinedAddress, matrixItemId: "", displayName: roomName))
+        addressValidationSubject = CurrentValueSubject(.none("#"))
+        avatarViewDataSubject = CurrentValueSubject(AvatarInput(mxContentUri: userDefinedAddress, matrixItemId: "", displayName: roomName))
         
-        self.updateDefaultAddress()
-        self.validateAddress()
+        updateDefaultAddress()
+        validateAddress()
     }
     
     deinit {
@@ -89,7 +91,7 @@ class SpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
     // MARK: Private
     
     private func updateAvatar() {
-        self.avatarViewDataSubject.send(AvatarInput(mxContentUri: currentAddress, matrixItemId: "", displayName: roomName))
+        avatarViewDataSubject.send(AvatarInput(mxContentUri: currentAddress, matrixItemId: "", displayName: roomName))
     }
     
     private func updateDefaultAddress() {
@@ -100,7 +102,7 @@ class SpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
         currentOperation?.cancel()
         currentOperation = nil
 
-        guard let userDefinedAddress = self.userDefinedAddress, !userDefinedAddress.isEmpty else {
+        guard let userDefinedAddress = userDefinedAddress, !userDefinedAddress.isEmpty else {
             let fullAddress = MXTools.fullLocalAlias(from: defaultAddress, with: session)
             
             if defaultAddress.isEmpty {

RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsScreenState.swift

@@ -1,6 +1,6 @@
 // File created from TemplateAdvancedRoomsExample
 // $ createSwiftUITwoScreen.sh Spaces/SpaceCreation SpaceCreation SpaceCreationMenu SpaceCreationSettings
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@
 import Foundation
 import SwiftUI
 
-
 /// Using an enum for the screen allows you define the different state cases with
 /// the relevant associated data for each case.
 enum MockSpaceCreationSettingsScreenState: MockScreenState, CaseIterable {
@@ -40,7 +39,7 @@ enum MockSpaceCreationSettingsScreenState: MockScreenState, CaseIterable {
         let creationParameters = SpaceCreationParameters()
         creationParameters.name = "Fake"
 
-        let service: MockSpaceCreationSettingsService = MockSpaceCreationSettingsService()
+        let service = MockSpaceCreationSettingsService()
         switch self {
         case .privateSpace:
             creationParameters.isPublic = false
@@ -60,7 +59,7 @@ enum MockSpaceCreationSettingsScreenState: MockScreenState, CaseIterable {
         return (
             [service, viewModel],
             AnyView(SpaceCreationSettings(viewModel: viewModel.context)
-                        .addDependency(MockAvatarService.example))
+                .addDependency(MockAvatarService.example))
         )
     }
 }

RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsService.swift

@@ -1,6 +1,6 @@
 // File created from TemplateAdvancedRoomsExample
 // $ createSwiftUITwoScreen.sh Spaces/SpaceCreation SpaceCreation SpaceCreationMenu SpaceCreationSettings
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,19 +16,17 @@
 // limitations under the License.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 class MockSpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
-    
-
     var addressValidationSubject: CurrentValueSubject<SpaceCreationSettingsAddressValidationStatus, Never>
     var avatarViewDataSubject: CurrentValueSubject<AvatarInputProtocol, Never>
     var defaultAddressSubject: CurrentValueSubject<String, Never>
     var spaceAddress: String?
     var roomName: String
     var userDefinedAddress: String?
-    var isAddressValid: Bool = true
+    var isAddressValid = true
 
     init() {
         roomName = "Fake"
@@ -38,7 +36,7 @@ class MockSpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol {
     }
     
     func simulateUpdate(addressValidationStatus: SpaceCreationSettingsAddressValidationStatus) {
-        self.addressValidationSubject.value = addressValidationStatus
+        addressValidationSubject.value = addressValidationStatus
     }
     
 //    func simulateUpdate()

RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/SpaceCreationSettingsServiceProtocol.swift

@@ -1,6 +1,6 @@
 // File created from TemplateAdvancedRoomsExample
 // $ createSwiftUITwoScreen.sh Spaces/SpaceCreation SpaceCreation SpaceCreationMenu SpaceCreationSettings
-// 
+//
 // Copyright 2021 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 // limitations under the License.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 protocol SpaceCreationSettingsServiceProtocol: AnyObject {
     var defaultAddressSubject: CurrentValueSubject<String, Never> { get }