IOS-2548 Remove ServerConfigurationCoordinatorAssembly

anyproto · Apr 8, 2024 · f9c1b25 · f9c1b25
1 parent fb551b8
commit f9c1b25
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 39 deletions.
diff --git a/Anytype.xcodeproj/project.pbxproj b/Anytype.xcodeproj/project.pbxproj
@@ -815,7 +815,6 @@
 		2AE7ECA4298816F30079F12B /* WidgetObjectListModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE7ECA1298816F30079F12B /* WidgetObjectListModuleAssembly.swift */; };
 		2AE85FE92B1F490F00268E9D /* ServerConfigurationCoordinatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE85FE82B1F490F00268E9D /* ServerConfigurationCoordinatorView.swift */; };
 		2AE85FEB2B1F491900268E9D /* ServerConfigurationCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE85FEA2B1F491900268E9D /* ServerConfigurationCoordinatorViewModel.swift */; };
-		2AE85FED2B1F4A0C00268E9D /* ServerConfigurationCoordinatorAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE85FEC2B1F4A0C00268E9D /* ServerConfigurationCoordinatorAssembly.swift */; };
 		2AE85FEF2B1F4BD800268E9D /* ServerDocumentPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE85FEE2B1F4BD800268E9D /* ServerDocumentPickerView.swift */; };
 		2AE85FF12B1F4BFA00268E9D /* ServerDocumentPickerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE85FF02B1F4BFA00268E9D /* ServerDocumentPickerViewModel.swift */; };
 		2AE85FF52B1F4ED500268E9D /* ServerConfigurationModuleOutput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE85FF42B1F4ED500268E9D /* ServerConfigurationModuleOutput.swift */; };
@@ -2608,7 +2607,6 @@
 		2AE7ECA1298816F30079F12B /* WidgetObjectListModuleAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WidgetObjectListModuleAssembly.swift; sourceTree = "<group>"; };
 		2AE85FE82B1F490F00268E9D /* ServerConfigurationCoordinatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfigurationCoordinatorView.swift; sourceTree = "<group>"; };
 		2AE85FEA2B1F491900268E9D /* ServerConfigurationCoordinatorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfigurationCoordinatorViewModel.swift; sourceTree = "<group>"; };
-		2AE85FEC2B1F4A0C00268E9D /* ServerConfigurationCoordinatorAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfigurationCoordinatorAssembly.swift; sourceTree = "<group>"; };
 		2AE85FEE2B1F4BD800268E9D /* ServerDocumentPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerDocumentPickerView.swift; sourceTree = "<group>"; };
 		2AE85FF02B1F4BFA00268E9D /* ServerDocumentPickerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerDocumentPickerViewModel.swift; sourceTree = "<group>"; };
 		2AE85FF42B1F4ED500268E9D /* ServerConfigurationModuleOutput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfigurationModuleOutput.swift; sourceTree = "<group>"; };
@@ -7016,7 +7014,6 @@
 			children = (
 				2AE85FE82B1F490F00268E9D /* ServerConfigurationCoordinatorView.swift */,
 				2AE85FEA2B1F491900268E9D /* ServerConfigurationCoordinatorViewModel.swift */,
-				2AE85FEC2B1F4A0C00268E9D /* ServerConfigurationCoordinatorAssembly.swift */,
 			);
 			path = ServerConfiguration;
 			sourceTree = "<group>";
@@ -10952,7 +10949,6 @@
 				3DDD3D0F26AEB55700B5673A /* BlockFile+MediaData.swift in Sources */,
 				3DB1CA0B27293156000D2779 /* MiddlewareConfiguration.swift in Sources */,
 				2A6476452B95B8A800389E62 /* SpaceMembersView.swift in Sources */,
-				2AE85FED2B1F4A0C00268E9D /* ServerConfigurationCoordinatorAssembly.swift in Sources */,
 				2AA4E51B29E8547B008632EB /* BlockWidgetLayout+Analytics.swift in Sources */,
 				2ADF94D429CDAFB000F6FFCC /* EnvironmentConfiguration.swift in Sources */,
 				2E7C4471289842E10062287C /* DataviewFilter+Update.swift in Sources */,

diff --git a/Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDI.swift b/Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDI.swift
@@ -153,10 +153,6 @@ final class CoordinatorsDI: CoordinatorsDIProtocol {
         )
     }
 
-    func serverConfiguration() -> ServerConfigurationCoordinatorAssemblyProtocol {
-        ServerConfigurationCoordinatorAssembly(modulesDI: modulesDI)
-    }
-
     func sharingTip() -> SharingTipCoordinatorProtocol {
         SharingTipCoordinator(
             navigationContext: uiHelpersDI.commonNavigationContext()

diff --git a/Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDIProtocol.swift b/Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDIProtocol.swift
@@ -28,7 +28,6 @@ protocol CoordinatorsDIProtocol: AnyObject {
     func initial() -> InitialCoordinatorAssemblyProtocol
     func spaceSwitch() -> SpaceSwitchCoordinatorAssemblyProtocol
     func setObjectCreation() -> SetObjectCreationCoordinatorAssemblyProtocol
-    func serverConfiguration() -> ServerConfigurationCoordinatorAssemblyProtocol
     func sharingTip() -> SharingTipCoordinatorProtocol
     func typeSearchForNewObject() -> TypeSearchForNewObjectCoordinatorAssemblyProtocol
 

diff --git a/Anytype/Sources/PresentationLayer/Auth/Auth/AuthCoordinator.swift b/Anytype/Sources/PresentationLayer/Auth/Auth/AuthCoordinator.swift
@@ -12,18 +12,15 @@ final class AuthCoordinator: AuthCoordinatorProtocol, AuthViewModelOutput {
 
     private let joinFlowCoordinator: JoinFlowCoordinatorProtocol
     private let loginFlowCoordinator: LoginFlowCoordinatorProtocol
-    private let serverConfigurationCoordinatorAssembly: ServerConfigurationCoordinatorAssemblyProtocol
     private let urlOpener: URLOpenerProtocol
 
     init(
         joinFlowCoordinator: JoinFlowCoordinatorProtocol,
         loginFlowCoordinator: LoginFlowCoordinatorProtocol,
-        serverConfigurationCoordinatorAssembly: ServerConfigurationCoordinatorAssemblyProtocol,
         urlOpener: URLOpenerProtocol
     ) {
         self.joinFlowCoordinator = joinFlowCoordinator
         self.loginFlowCoordinator = loginFlowCoordinator
-        self.serverConfigurationCoordinatorAssembly = serverConfigurationCoordinatorAssembly
         self.urlOpener = urlOpener
     }
 
@@ -48,6 +45,6 @@ final class AuthCoordinator: AuthCoordinatorProtocol, AuthViewModelOutput {
     }
 
     func onSettingsAction() -> AnyView {
-        serverConfigurationCoordinatorAssembly.make()
+        ServerConfigurationCoordinatorView().eraseToAnyView()
     }
 }
diff --git a/Anytype/Sources/PresentationLayer/Auth/Auth/AuthCoordinatorAssembly.swift b/Anytype/Sources/PresentationLayer/Auth/Auth/AuthCoordinatorAssembly.swift
@@ -30,7 +30,6 @@ final class AuthCoordinatorAssembly: AuthCoordinatorAssemblyProtocol {
         return AuthCoordinator(
             joinFlowCoordinator: coordinatorsID.joinFlow().make(),
             loginFlowCoordinator: coordinatorsID.loginFlow().make(), 
-            serverConfigurationCoordinatorAssembly: coordinatorsID.serverConfiguration(),
             urlOpener: uiHelpersDI.urlOpener()
         )
     }

diff --git a/.../PresentationLayer/Flows/ServerConfiguration/ServerConfigurationCoordinatorAssembly.swift b/.../PresentationLayer/Flows/ServerConfiguration/ServerConfigurationCoordinatorAssembly.swift
diff --git a/...rces/PresentationLayer/Flows/ServerConfiguration/ServerConfigurationCoordinatorView.swift b/...rces/PresentationLayer/Flows/ServerConfiguration/ServerConfigurationCoordinatorView.swift
@@ -3,7 +3,7 @@ import SwiftUI
 
 struct ServerConfigurationCoordinatorView: View {
 
-    @StateObject var model: ServerConfigurationCoordinatorViewModel
+    @StateObject private var model = ServerConfigurationCoordinatorViewModel()
 
     var body: some View {
         ServerConfigurationView(output: model)