ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a new UserHooks container and move some AppHooks. (#6332)

Browse Source 
* Add a UserHooks system with just the CreateRoomScreenHook for now.

* Move more hooks into UserHooks.

* Pass the ClientProxy to makeUserHooks instead of calling AppHooks.configure(with:).

* Update the Enterprise submodule.
This commit is contained in:
Doug
2026-10-15 10:49:27 +01:00
committed by GitHub
parent 11b6cc3f70
commit b6ccbbc6c3
45 changed files with 90 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/CreateRoomScreen/CreateRoomScreenCoordinator.swift
+1 -3
View File
@@ -16,7 +16,6 @@ struct CreateRoomScreenCoordinatorParameters {
let userSession: UserSessionProtocol
let userIndicatorController: UserIndicatorControllerProtocol
let analytics: AnalyticsServiceProtocol
let appHooks: AppHooks
}
enum CreateRoomScreenCoordinatorAction {
@@ -40,8 +39,7 @@ final class CreateRoomScreenCoordinator: CoordinatorProtocol {
shouldShowCancelButton: parameters.shouldShowCancelButton,
userSession: parameters.userSession,
analytics: parameters.analytics,
userIndicatorController: parameters.userIndicatorController,
appHooks: parameters.appHooks)
userIndicatorController: parameters.userIndicatorController)
}
func start() {
ElementX/Sources/Screens/CreateRoomScreen/CreateRoomScreenViewModel.swift
+2 -3
View File
@@ -32,8 +32,7 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
shouldShowCancelButton: Bool,
userSession: UserSessionProtocol,
analytics: AnalyticsServiceProtocol,
userIndicatorController: UserIndicatorControllerProtocol,
appHooks: AppHooks) {
userIndicatorController: UserIndicatorControllerProtocol) {
self.userSession = userSession
mediaUploadingPreprocessor = MediaUploadingPreprocessor(userSettings: userSession.userSettings)
self.analytics = analytics
@@ -68,7 +67,7 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
aliasLocalPart: roomAliasNameFromRoomDisplayName(roomName: ""),
bindings: bindings)
super.init(initialViewState: appHooks.createRoomScreenHook.update(viewState, homeserver: userSession.clientProxy.homeserver),
super.init(initialViewState: userSession.userHooks.createRoomScreenHook.update(viewState, homeserver: userSession.clientProxy.homeserver),
mediaProvider: userSession.mediaProvider)
setupBindings()
ElementX/Sources/Screens/CreateRoomScreen/View/CreateRoomScreen.swift
+1 -2
View File
@@ -466,7 +466,6 @@ struct CreateRoom_Previews: PreviewProvider, TestablePreview {
shouldShowCancelButton: isSpace,
userSession: userSession,
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/CreateRoomScreen/View/CreateRoomSpaceSelectionSheet.swift
+1 -2
View File
@@ -70,8 +70,7 @@ struct CreateRoomSpaceSelectionSheet_Previews: PreviewProvider, TestablePreview
shouldShowCancelButton: false,
userSession: userSession,
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
}()
static var previews: some View {
ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenCoordinator.swift
-2
View File
@@ -12,7 +12,6 @@ import SwiftUI
struct RoomDetailsScreenCoordinatorParameters {
let roomProxy: JoinedRoomProxyProtocol
let userSession: UserSessionProtocol
let appHooks: AppHooks
let analyticsService: AnalyticsServiceProtocol
let userIndicatorController: UserIndicatorControllerProtocol
let notificationSettings: NotificationSettingsProxyProtocol
@@ -53,7 +52,6 @@ final class RoomDetailsScreenCoordinator: CoordinatorProtocol {
isSpace = parameters.roomProxy.infoPublisher.value.isSpace
viewModel = RoomDetailsScreenViewModel(roomProxy: parameters.roomProxy,
userSession: parameters.userSession,
appHooks: parameters.appHooks,
analyticsService: parameters.analyticsService,
userIndicatorController: parameters.userIndicatorController,
notificationSettingsProxy: parameters.notificationSettings,
ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift
+1 -2
View File
@@ -45,7 +45,6 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
init(roomProxy: JoinedRoomProxyProtocol,
userSession: UserSessionProtocol,
appHooks: AppHooks,
analyticsService: AnalyticsServiceProtocol,
userIndicatorController: UserIndicatorControllerProtocol,
notificationSettingsProxy: NotificationSettingsProxyProtocol,
@@ -68,7 +67,7 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
notificationSettingsState: .loading,
isNativeCallingEnabled: userSession.userSettings.app.nativeCallEnabled,
bindings: .init())
super.init(initialViewState: appHooks.roomDetailsScreenHook.update(viewState),
super.init(initialViewState: userSession.userHooks.roomDetailsScreenHook.update(viewState),
mediaProvider: userSession.mediaProvider)
Task {
ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
-3
View File
@@ -441,7 +441,6 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init()),
appHooks: AppHooks(),
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: notificationSettingsProxy,
@@ -469,7 +468,6 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init()),
appHooks: AppHooks(),
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: notificationSettingsProxy,
@@ -507,7 +505,6 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
appHooks: AppHooks(),
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: notificationSettingsProxy,
ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenCoordinator.swift
-2
View File
@@ -13,7 +13,6 @@ struct RoomMemberDetailsScreenCoordinatorParameters {
let userID: String
let roomProxy: JoinedRoomProxyProtocol
let userSession: UserSessionProtocol
let appHooks: AppHooks
let analytics: AnalyticsServiceProtocol
let userIndicatorController: UserIndicatorControllerProtocol
}
@@ -39,7 +38,6 @@ final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
viewModel = RoomMemberDetailsScreenViewModel(userID: parameters.userID,
roomProxy: parameters.roomProxy,
userSession: parameters.userSession,
appHooks: parameters.appHooks,
analytics: parameters.analytics,
userIndicatorController: parameters.userIndicatorController)
}
ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift
+1 -2
View File
@@ -28,7 +28,6 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
init(userID: String,
roomProxy: JoinedRoomProxyProtocol,
userSession: UserSessionProtocol,
appHooks: AppHooks,
analytics: AnalyticsServiceProtocol,
userIndicatorController: UserIndicatorControllerProtocol) {
self.roomProxy = roomProxy
@@ -38,7 +37,7 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
let initialViewState = RoomMemberDetailsScreenViewState(userID: userID, bindings: .init())
super.init(initialViewState: appHooks.roomMemberDetailsScreenHook.update(initialViewState),
super.init(initialViewState: userSession.userHooks.roomMemberDetailsScreenHook.update(initialViewState),
mediaProvider: userSession.mediaProvider)
showMemberLoadingIndicator()
ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
-1
View File
@@ -239,7 +239,6 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
return RoomMemberDetailsScreenViewModel(userID: member.userID,
roomProxy: roomProxyMock,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
appHooks: AppHooks(),
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
}
ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
-2
View File
@@ -24,7 +24,6 @@ struct RoomScreenCoordinatorParameters {
let completionSuggestionService: CompletionSuggestionServiceProtocol
let ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>
let appMediator: AppMediatorProtocol
let appHooks: AppHooks
let analytics: AnalyticsServiceProtocol
let composerDraftService: ComposerDraftServiceProtocol
let timelineControllerFactory: TimelineControllerFactoryProtocol
@@ -77,7 +76,6 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
roomProxy: parameters.roomProxy,
initialSelectedPinnedEventID: selectedPinnedEventID,
ongoingCallRoomIDPublisher: parameters.ongoingCallRoomIDPublisher,
appHooks: parameters.appHooks,
analyticsService: parameters.analytics,
userIndicatorController: parameters.userIndicatorController)
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+3 -6
View File
@@ -54,7 +54,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
roomProxy: JoinedRoomProxyProtocol,
initialSelectedPinnedEventID: String?,
ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>,
appHooks: AppHooks,
analyticsService: AnalyticsServiceProtocol,
userIndicatorController: UserIndicatorControllerProtocol) {
clientProxy = userSession.clientProxy
@@ -73,7 +72,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
isDM: roomProxy.infoPublisher.value.isDM,
hasSuccessor: roomProxy.infoPublisher.value.successor != nil,
roomHistorySharingState: roomProxy.infoPublisher.value.historySharingState)
super.init(initialViewState: appHooks.roomScreenHook.update(viewState),
super.init(initialViewState: userSession.userHooks.roomScreenHook.update(viewState),
mediaProvider: userSession.mediaProvider)
updateRoomInfo(roomProxy.infoPublisher.value)
@@ -459,13 +458,11 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
extension RoomScreenViewModel {
static func mock(roomProxyMock: JoinedRoomProxyMock,
clientProxyMock: ClientProxyMock = ClientProxyMock(.init()),
appHooks: AppHooks = AppHooks()) -> RoomScreenViewModel {
RoomScreenViewModel(userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
userSession: UserSessionProtocol = UserSessionMock(.init())) -> RoomScreenViewModel {
RoomScreenViewModel(userSession: userSession,
roomProxy: roomProxyMock,
initialSelectedPinnedEventID: nil,
ongoingCallRoomIDPublisher: .init(.init(nil)),
appHooks: appHooks,
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
}
ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenCoordinator.swift
+1 -3
View File
@@ -13,7 +13,6 @@ struct SecurityAndPrivacyScreenCoordinatorParameters {
let roomProxy: JoinedRoomProxyProtocol
let userSession: UserSessionProtocol
let userIndicatorController: UserIndicatorControllerProtocol
let appHooks: AppHooks
}
enum SecurityAndPrivacyScreenCoordinatorAction {
@@ -35,8 +34,7 @@ final class SecurityAndPrivacyScreenCoordinator: CoordinatorProtocol {
init(parameters: SecurityAndPrivacyScreenCoordinatorParameters) {
viewModel = SecurityAndPrivacyScreenViewModel(roomProxy: parameters.roomProxy,
userSession: parameters.userSession,
userIndicatorController: parameters.userIndicatorController,
appHooks: parameters.appHooks)
userIndicatorController: parameters.userIndicatorController)
}
func start() {
ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift
+2 -3
View File
@@ -25,8 +25,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
init(roomProxy: JoinedRoomProxyProtocol,
userSession: UserSessionProtocol,
userIndicatorController: UserIndicatorControllerProtocol,
appHooks: AppHooks) {
userIndicatorController: UserIndicatorControllerProtocol) {
self.roomProxy = roomProxy
clientProxy = userSession.clientProxy
self.userIndicatorController = userIndicatorController
@@ -39,7 +38,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
isKnockingEnabled: userSettings.app.knockingEnabled,
historySharingDetailsURL: userSettings.app.historySharingDetailsURL)
super.init(initialViewState: appHooks.securityAndPrivacyScreenHook.update(viewState, homeserver: clientProxy.homeserver))
super.init(initialViewState: userSession.userHooks.securityAndPrivacyScreenHook.update(viewState, homeserver: clientProxy.homeserver))
if let powerLevels = roomProxy.infoPublisher.value.powerLevels {
setupPermissions(powerLevels: powerLevels)
ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift
+9 -18
View File
@@ -234,8 +234,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
static let inviteOnlyViewModel = SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(members: .allMembersAsCreator,
joinRule: .invite)),
userSession: UserSessionMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
static let publicViewModel = SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(isEncrypted: false,
canonicalAlias: "#room:matrix.org",
@@ -243,15 +242,13 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
joinRule: .public,
isVisibleInPublicDirectory: true)),
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org")))),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
static let publicNoAddressViewModel = SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(isEncrypted: false,
members: .allMembersAsCreator,
joinRule: .public)),
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org")))),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
static let singleSpaceMembersViewModel = {
let space = [SpaceServiceRoom].mockSingleRoom[0]
@@ -263,8 +260,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
isVisibleInPublicDirectory: true)),
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
spaceServiceConfiguration: .init(joinedParentSpaces: [space]))))),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
}()
static let multipleSpacesMembersViewModel = {
@@ -277,8 +273,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
isVisibleInPublicDirectory: true)),
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
spaceServiceConfiguration: .init(joinedParentSpaces: spaces))))),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
}()
static let askToJoinViewModel = {
@@ -292,8 +287,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
isVisibleInPublicDirectory: true)),
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org")),
userSettings: userSettings)),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
}()
static let singleAskToJoinSpaceMembersViewModel = {
@@ -310,8 +304,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
spaceServiceConfiguration: .init(joinedParentSpaces: [space]))),
userSettings: userSettings)),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
}()
static let multipleAskToJoinSpacesMembersViewModel = {
@@ -328,8 +321,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
spaceServiceConfiguration: .init(joinedParentSpaces: spaces))),
userSettings: userSettings)),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
}()
static let publicSpaceViewModel = SecurityAndPrivacyScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(isSpace: true,
@@ -339,8 +331,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
joinRule: .public,
isVisibleInPublicDirectory: true)),
userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org")))),
userIndicatorController: UserIndicatorControllerMock(),
appHooks: AppHooks())
userIndicatorController: UserIndicatorControllerMock())
static var previews: some View {
ElementNavigationStack {
ElementX/Sources/Screens/Spaces/SpaceSettingsScreen/View/SpaceSettingsScreen.swift
-1
View File
@@ -132,7 +132,6 @@ struct SpaceSettingsScreen_Previews: PreviewProvider, TestablePreview {
canonicalAlias: "#space:matrix.org",
members: members)),
userSession: UserSessionMock(.init()),
appHooks: AppHooks(),
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenCoordinator.swift
-2
View File
@@ -13,7 +13,6 @@ struct UserProfileScreenCoordinatorParameters {
let userID: String
let isPresentedModally: Bool
let userSession: UserSessionProtocol
let appHooks: AppHooks
let analytics: AnalyticsServiceProtocol
let userIndicatorController: UserIndicatorControllerProtocol
}
@@ -38,7 +37,6 @@ final class UserProfileScreenCoordinator: CoordinatorProtocol {
viewModel = UserProfileScreenViewModel(userID: parameters.userID,
isPresentedModally: parameters.isPresentedModally,
userSession: parameters.userSession,
appHooks: parameters.appHooks,
analytics: parameters.analytics,
userIndicatorController: parameters.userIndicatorController)
}
ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift
+1 -2
View File
@@ -25,7 +25,6 @@ class UserProfileScreenViewModel: UserProfileScreenViewModelType, UserProfileScr
init(userID: String,
isPresentedModally: Bool,
userSession: UserSessionProtocol,
appHooks: AppHooks,
analytics: AnalyticsServiceProtocol,
userIndicatorController: UserIndicatorControllerProtocol) {
self.userSession = userSession
@@ -37,7 +36,7 @@ class UserProfileScreenViewModel: UserProfileScreenViewModelType, UserProfileScr
isPresentedModally: isPresentedModally,
bindings: .init())
super.init(initialViewState: appHooks.userProfileScreenHook.update(initialViewState),
super.init(initialViewState: userSession.userHooks.userProfileScreenHook.update(initialViewState),
mediaProvider: userSession.mediaProvider)
showLoadingIndicator(allowsInteraction: true)
ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift
-1
View File
@@ -147,7 +147,6 @@ struct UserProfileScreen_Previews: PreviewProvider, TestablePreview {
return UserProfileScreenViewModel(userID: userID,
isPresentedModally: false,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
appHooks: AppHooks(),
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
}