Skip to content

Commit f2d6e8d

Browse files
authored
Merge pull request #4170 from anyproto/ios-5399-delete-brandnewauthflow-toggle
iOS-5399 Core | Delete brandnewauthflow toggle
2 parents ee478a2 + 73fa525 commit f2d6e8d

File tree

57 files changed

+18
-2067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+18
-2067
lines changed

Anytype/Sources/ApplicationLayer/AppCoordinator/ApplicationCoordinatorView.swift

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,31 +44,14 @@ struct ApplicationCoordinatorView: View {
4444
switch model.applicationState {
4545
case .initial:
4646
InitialCoordinatorView()
47-
.if(!FeatureFlags.brandNewAuthFlow) {
48-
$0.overrideDefaultInterfaceStyle(.dark)
49-
}
5047
case .auth:
51-
if FeatureFlags.brandNewAuthFlow {
52-
AuthCoordinatorView()
53-
} else {
54-
model.authView()
55-
.overrideDefaultInterfaceStyle(.dark)
56-
}
48+
AuthCoordinatorView()
5749
case .login:
5850
LaunchView()
59-
.if(!FeatureFlags.brandNewAuthFlow) {
60-
$0.overrideDefaultInterfaceStyle(.dark)
61-
}
6251
case .home:
6352
SpaceHubCoordinatorView()
64-
.if(!FeatureFlags.brandNewAuthFlow) {
65-
$0.overrideDefaultInterfaceStyle(nil)
66-
}
6753
case .delete:
68-
model.deleteAccount()?
69-
.if(!FeatureFlags.brandNewAuthFlow) {
70-
$0.overrideDefaultInterfaceStyle(nil)
71-
}
54+
model.deleteAccount()
7255
}
7356
}
7457
}

Anytype/Sources/ApplicationLayer/AppCoordinator/ApplicationCoordinatorViewModel.swift

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ final class ApplicationCoordinatorViewModel: ObservableObject {
2424
private var basicUserInfoStorage: any BasicUserInfoStorageProtocol
2525
@Injected(\.pushNotificationsPermissionService)
2626
private var pushNotificationsPermissionService: any PushNotificationsPermissionServiceProtocol
27-
28-
private var authCoordinator: (any AuthCoordinatorProtocol)?
27+
2928
private var dismissAllPresented: DismissAllPresented?
3029

3130
// MARK: - State
@@ -34,21 +33,6 @@ final class ApplicationCoordinatorViewModel: ObservableObject {
3433
@Published var toastBarData: ToastBarData?
3534
@Published var migrationData: MigrationModuleData?
3635
@Published var selectAccountTaskId: String?
37-
38-
// MARK: - Initializers
39-
40-
func authView() -> AnyView {
41-
if let authCoordinator {
42-
return authCoordinator.startFlow()
43-
}
44-
45-
let coordinator = AuthCoordinator(
46-
joinFlowCoordinator: JoinFlowCoordinator(),
47-
loginFlowCoordinator: LoginFlowCoordinator()
48-
)
49-
self.authCoordinator = coordinator
50-
return coordinator.startFlow()
51-
}
5236

5337
func deleteAccount() -> AnyView? {
5438
if case let .pendingDeletion(deadline) = accountManager.account.status {

Anytype/Sources/PresentationLayer/Auth/Auth/AuthBackgroundView.swift

Lines changed: 0 additions & 55 deletions
This file was deleted.

Anytype/Sources/PresentationLayer/Auth/Auth/AuthCoordinator.swift

Lines changed: 0 additions & 43 deletions
This file was deleted.

Anytype/Sources/PresentationLayer/Auth/Auth/AuthView.swift

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)