From 2bbba6e4e068598cb867ae75f71dd7a1bd432661 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 7 Aug 2025 15:26:11 +0100 Subject: [PATCH] Fix some SwiftLint warnings. --- ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift | 1 + ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift | 4 +++- .../RoomDetailsScreen/RoomDetailsScreenViewModel.swift | 4 +++- .../RoomRolesAndPermissionsScreenViewModel.swift | 2 +- UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift index d636e797a..0adfd9329 100644 --- a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift +++ b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift @@ -129,6 +129,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol { fatalError("This flow coordinator expect a route") } + // swiftlint:disable:next cyclomatic_complexity func handleAppRoute(_ appRoute: AppRoute, animated: Bool) { guard stateMachine.state != .complete else { fatalError("This flow coordinator is `finished` ☠️") diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift index cfcb4af32..9ecba805c 100644 --- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift +++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift @@ -366,7 +366,9 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol title: L10n.leaveRoomAlertSelectNewOwnerTitle, message: L10n.leaveRoomAlertSelectNewOwnerSubtitle, primaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil), - secondaryButton: .init(title: L10n.leaveRoomAlertSelectNewOwnerAction, role: .destructive, action: { [weak self] in self?.actionsSubject.send(.transferOwnership(roomIdentifier: roomID)) })) + secondaryButton: .init(title: L10n.leaveRoomAlertSelectNewOwnerAction, role: .destructive) { [weak self] in + self?.actionsSubject.send(.transferOwnership(roomIdentifier: roomID)) + }) return } } diff --git a/ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift b/ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift index be6fe8333..e72ad167e 100644 --- a/ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift @@ -193,7 +193,9 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr title: L10n.leaveRoomAlertSelectNewOwnerTitle, message: L10n.leaveRoomAlertSelectNewOwnerSubtitle, primaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil), - secondaryButton: .init(title: L10n.leaveRoomAlertSelectNewOwnerAction, role: .destructive, action: { [weak self] in self?.actionsSubject.send(.transferOwnership) })) + secondaryButton: .init(title: L10n.leaveRoomAlertSelectNewOwnerAction, role: .destructive) { [weak self] in + self?.actionsSubject.send(.transferOwnership) + }) return } } diff --git a/ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/RoomRolesAndPermissionsScreenViewModel.swift b/ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/RoomRolesAndPermissionsScreenViewModel.swift index 7562a1e89..d79bf0463 100644 --- a/ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/RoomRolesAndPermissionsScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/RoomRolesAndPermissionsScreenViewModel.swift @@ -25,7 +25,7 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM self.roomProxy = roomProxy self.userIndicatorController = userIndicatorController self.analytics = analytics - super.init(initialViewState: RoomRolesAndPermissionsScreenViewState(ownRole: roomProxy.membersPublisher.value.first(where: { $0.userID == roomProxy.ownUserID })?.role ?? .administrator, + super.init(initialViewState: RoomRolesAndPermissionsScreenViewState(ownRole: roomProxy.membersPublisher.value.first { $0.userID == roomProxy.ownUserID }?.role ?? .administrator, permissions: initialPermissions)) // Automatically update the admin/moderator counts. diff --git a/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift b/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift index 64f2f3ba1..bd09fc429 100644 --- a/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift +++ b/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift @@ -39,7 +39,7 @@ class RoomChangeRolesScreenViewModelTests: XCTestCase { XCTAssertEqual(context.viewState.moderators, context.viewState.visibleModerators) XCTAssertEqual(context.viewState.users, context.viewState.visibleUsers) XCTAssertEqual(context.viewState.membersWithRole.count, 3) - XCTAssert(context.viewState.membersWithRole.first(where: { $0.id == RoomMemberProxyMock.mockModerator.userID }) != nil) + XCTAssertNotNil(context.viewState.membersWithRole.first { $0.id == RoomMemberProxyMock.mockModerator.userID }) XCTAssertFalse(context.viewState.hasChanges) XCTAssertFalse(context.viewState.isSearching) }