Periphery cleanup (#5893)

2026-11-06 04:18:31 +00:00 · 2026-07-20 11:16:11 +02:00
parent 175aca596e
commit 9093631f8b
275 changed files with 381 additions and 2268 deletions
@@ -16,7 +16,6 @@ struct LoginScreenCoordinatorParameters {
    let loginHint: String?
    let userIndicatorController: UserIndicatorControllerProtocol
    let appSettings: AppSettings
-    let analytics: AnalyticsServiceProtocol
 }

 enum LoginScreenCoordinatorAction {
@@ -28,13 +27,8 @@ enum LoginScreenCoordinatorAction {

 /// Note: This code was brought over from Riot, we should move the authentication service logic into the view model.
 final class LoginScreenCoordinator: CoordinatorProtocol {
-    private let parameters: LoginScreenCoordinatorParameters
    private var viewModel: LoginScreenViewModelProtocol
    
-    private var authenticationService: AuthenticationServiceProtocol {
-        parameters.authenticationService
-    }
-    
    private let actionsSubject: PassthroughSubject<LoginScreenCoordinatorAction, Never> = .init()
    private var cancellables = Set<AnyCancellable>()
    
@@ -45,13 +39,10 @@ final class LoginScreenCoordinator: CoordinatorProtocol {
    // MARK: - Setup
    
    init(parameters: LoginScreenCoordinatorParameters) {
-        self.parameters = parameters
-        
        viewModel = LoginScreenViewModel(authenticationService: parameters.authenticationService,
                                         loginHint: parameters.loginHint,
                                         userIndicatorController: parameters.userIndicatorController,
-                                         appSettings: parameters.appSettings,
-                                         analytics: parameters.analytics)
+                                         appSettings: parameters.appSettings)
    }
    
    // MARK: - Public
@@ -63,14 +63,10 @@ enum LoginScreenViewAction {
 }

 enum LoginScreenErrorType: Hashable {
-    /// A specific error message shown in an alert.
-    case alert(String)
    /// An alert that informs the user to check their username/password.
    case credentialsAlert
    /// An alert that informs the user that their account has been deactivated.
    case deactivatedAlert
-    /// An alert that informs the user about a bad well-known file.
-    case invalidWellKnownAlert(String)
    /// An alert that allows the user to learn about sliding sync.
    case slidingSyncAlert
    /// An alert that informs the user that Element Pro should be used for a particular server.
@@ -15,7 +15,6 @@ class LoginScreenViewModel: LoginScreenViewModelType, LoginScreenViewModelProtoc
    private let authenticationService: AuthenticationServiceProtocol
    private let userIndicatorController: UserIndicatorControllerProtocol
    private let appSettings: AppSettings
-    private let analytics: AnalyticsServiceProtocol
    
    private var actionsSubject: PassthroughSubject<LoginScreenViewModelAction, Never> = .init()
    var actions: AnyPublisher<LoginScreenViewModelAction, Never> {
@@ -25,12 +24,10 @@ class LoginScreenViewModel: LoginScreenViewModelType, LoginScreenViewModelProtoc
    init(authenticationService: AuthenticationServiceProtocol,
         loginHint: String?,
         userIndicatorController: UserIndicatorControllerProtocol,
-         appSettings: AppSettings,
-         analytics: AnalyticsServiceProtocol) {
+         appSettings: AppSettings) {
        self.authenticationService = authenticationService
        self.userIndicatorController = userIndicatorController
        self.appSettings = appSettings
-        self.analytics = analytics
        
        let username = switch loginHint {
        case .some(let hint) where hint.hasPrefix("mxid:"): String(hint.dropFirst(5)) // MSC4198
@@ -156,8 +156,7 @@ struct LoginScreen_Previews: PreviewProvider, TestablePreview {
        let viewModel = LoginScreenViewModel(authenticationService: authenticationService,
                                             loginHint: nil,
                                             userIndicatorController: UserIndicatorControllerMock(),
-                                             appSettings: .volatile(),
-                                             analytics: AnalyticsServiceMock(.init()))
+                                             appSettings: .volatile())
        
        if withCredentials {
            viewModel.context.username = "alice"
@@ -25,11 +25,7 @@ enum ServerSelectionScreenCoordinatorAction {
 /// Note: This code was brought over from Riot, we should move the authentication service logic into the view model.
 final class ServerSelectionScreenCoordinator: CoordinatorProtocol {
    private let parameters: ServerSelectionScreenCoordinatorParameters
-    private let userIndicatorController: UserIndicatorControllerProtocol
    private var viewModel: ServerSelectionScreenViewModelProtocol
-    private var authenticationService: AuthenticationServiceProtocol {
-        parameters.authenticationService
-    }
    
    private let actionsSubject: PassthroughSubject<ServerSelectionScreenCoordinatorAction, Never> = .init()
    private var cancellables = Set<AnyCancellable>()
@@ -44,7 +40,6 @@ final class ServerSelectionScreenCoordinator: CoordinatorProtocol {
                                                   authenticationFlow: parameters.authenticationFlow,
                                                   appSettings: parameters.appSettings,
                                                   userIndicatorController: parameters.userIndicatorController)
-        userIndicatorController = parameters.userIndicatorController
    }
    
    // MARK: - Public
@@ -57,8 +57,6 @@ enum ServerSelectionScreenViewAction {
 }

 enum ServerSelectionScreenErrorType: Hashable {
-    /// An error message to be shown in the text field footer.
-    case footerMessage(String)
    /// An alert that informs the user about a bad well-known file.
    case invalidWellKnownAlert(String)
    /// An alert that allows the user to learn about sliding sync.
@@ -15,7 +15,6 @@ class AuthenticationStartScreenViewModel: AuthenticationStartScreenViewModelType
    private let authenticationService: AuthenticationServiceProtocol
    private let provisioningParameters: AccountProvisioningParameters?
    private let appMediator: AppMediatorProtocol
-    private let appSettings: AppSettings
    private let userIndicatorController: UserIndicatorControllerProtocol
    
    private let canReportProblem: Bool
@@ -37,7 +36,6 @@ class AuthenticationStartScreenViewModel: AuthenticationStartScreenViewModelType
        self.authenticationService = authenticationService
        self.provisioningParameters = provisioningParameters
        self.appMediator = appMediator
-        self.appSettings = appSettings
        self.userIndicatorController = userIndicatorController
        canReportProblem = isBugReportServiceEnabled