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

Fixes #2414 - Move member loading to the room member detail screen, avoid blocking the whole application

Browse Source
This commit is contained in:
Stefan Ceriu
2024-02-07 09:31:25 +02:00
committed by GitHub
parent f9edb75da5
commit b075ddb047
31 changed files with 305 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Application/Application.swift
+1
View File
@@ -31,6 +31,7 @@ struct Application: App {
} else {
appCoordinator = AppCoordinator(appDelegate: appDelegate)
}
SceneDelegate.windowManager = appCoordinator.windowManager
}
ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
+19 -28
View File
@@ -109,16 +109,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
case .roomList:
stateMachine.tryEvent(.dismissRoom, userInfo: EventUserInfo(animated: animated))
case .roomMemberDetails(let userID):
Task {
switch await roomProxy?.getMember(userID: userID) {
case .success(let member):
stateMachine.tryEvent(.presentRoomMemberDetails(member: .init(value: member)))
case .failure(let error):
MXLog.error("[RoomFlowCoordinator] Failed to get member: \(error)")
case .none:
MXLog.error("[RoomFlowCoordinator] Failed to get member: RoomProxy is nil")
}
}
stateMachine.tryEvent(.presentRoomMemberDetails(userID: userID))
case .genericCallLink, .oidcCallback, .settings, .chatBackupSettings:
break
}
@@ -173,10 +164,10 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
case (.roomMembersList(let roomID), .dismissRoomMembersList):
return .roomDetails(roomID: roomID, isRoot: false)
case (.room(let roomID), .presentRoomMemberDetails(let member)):
return .roomMemberDetails(roomID: roomID, member: member, fromRoomMembersList: false)
case (.roomMembersList(let roomID), .presentRoomMemberDetails(let member)):
return .roomMemberDetails(roomID: roomID, member: member, fromRoomMembersList: true)
case (.room(let roomID), .presentRoomMemberDetails(userID: let userID)):
return .roomMemberDetails(roomID: roomID, userID: userID, fromRoomMembersList: false)
case (.roomMembersList(let roomID), .presentRoomMemberDetails(userID: let userID)):
return .roomMemberDetails(roomID: roomID, userID: userID, fromRoomMembersList: true)
case (.roomMemberDetails(let roomID, _, let fromRoomMembersList), .dismissRoomMemberDetails):
return fromRoomMembersList ? .roomMembersList(roomID: roomID) : .room(roomID: roomID)
@@ -285,13 +276,13 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
case (.roomMembersList, .dismissRoomMembersList, .roomDetails):
break
case (.room, .presentRoomMemberDetails, .roomMemberDetails(_, let member, _)):
presentRoomMemberDetails(member: member.value)
case (.room, .presentRoomMemberDetails, .roomMemberDetails(_, let userID, _)):
presentRoomMemberDetails(userID: userID)
case (.roomMemberDetails, .dismissRoomMemberDetails, .room):
break
case (.roomMembersList, .presentRoomMemberDetails, .roomMemberDetails(_, let member, _)):
presentRoomMemberDetails(member: member.value)
case (.roomMembersList, .presentRoomMemberDetails, .roomMemberDetails(_, let userID, _)):
presentRoomMemberDetails(userID: userID)
case (.roomMemberDetails, .dismissRoomMemberDetails, .roomMembersList):
break
@@ -469,8 +460,8 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
stateMachine.tryEvent(.presentPollForm(mode: mode))
case .presentLocationViewer(_, let geoURI, let description):
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .viewOnly(geoURI: geoURI, description: description)))
case .presentRoomMemberDetails(member: let member):
stateMachine.tryEvent(.presentRoomMemberDetails(member: .init(value: member)))
case .presentRoomMemberDetails(userID: let userID):
stateMachine.tryEvent(.presentRoomMemberDetails(userID: userID))
case .presentMessageForwarding(let itemID):
stateMachine.tryEvent(.presentMessageForwarding(itemID: itemID))
case .presentCallScreen:
@@ -598,7 +589,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
case .invite:
stateMachine.tryEvent(.presentInviteUsersScreen)
case .selectedMember(let member):
stateMachine.tryEvent(.presentRoomMemberDetails(member: .init(value: member)))
stateMachine.tryEvent(.presentRoomMemberDetails(userID: member.userID))
}
}
.store(in: &cancellables)
@@ -931,13 +922,13 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
}
}
private func presentRoomMemberDetails(member: RoomMemberProxyProtocol) {
private func presentRoomMemberDetails(userID: String) {
guard let roomProxy else {
fatalError()
}
let params = RoomMemberDetailsScreenCoordinatorParameters(roomProxy: roomProxy,
roomMemberProxy: member,
userID: userID,
mediaProvider: userSession.mediaProvider,
userIndicatorController: userIndicatorController)
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: params)
@@ -945,7 +936,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
coordinator.actions.sink { [weak self] action in
guard let self else { return }
switch action {
case .openDirectChat:
case .openDirectChat(let displayName):
let loadingIndicatorIdentifier = "OpenDirectChatLoadingIndicator"
userIndicatorController.submitIndicator(UserIndicator(id: loadingIndicatorIdentifier,
@@ -956,12 +947,12 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
Task { [weak self] in
guard let self else { return }
let currentDirectRoom = await userSession.clientProxy.directRoomForUserID(member.userID)
let currentDirectRoom = await userSession.clientProxy.directRoomForUserID(userID)
switch currentDirectRoom {
case .success(.some(let roomID)):
stateMachine.tryEvent(.presentRoom(roomID: roomID))
case .success(nil):
switch await userSession.clientProxy.createDirectRoom(with: member.userID, expectedRoomName: member.displayName) {
switch await userSession.clientProxy.createDirectRoom(with: userID, expectedRoomName: displayName) {
case .success(let roomID):
analytics.trackCreatedRoom(isDM: true)
stateMachine.tryEvent(.presentRoom(roomID: roomID))
@@ -1185,7 +1176,7 @@ private extension RoomFlowCoordinator {
case notificationSettings(roomID: String)
case globalNotificationSettings(roomID: String)
case roomMembersList(roomID: String)
case roomMemberDetails(roomID: String, member: HashableRoomMemberWrapper, fromRoomMembersList: Bool)
case roomMemberDetails(roomID: String, userID: String, fromRoomMembersList: Bool)
case inviteUsersScreen(roomID: String, fromRoomMembersList: Bool)
case mediaUploadPicker(roomID: String, source: MediaPickerScreenSource)
case mediaUploadPreview(roomID: String, fileURL: URL)
@@ -1225,7 +1216,7 @@ private extension RoomFlowCoordinator {
case presentRoomMembersList
case dismissRoomMembersList
case presentRoomMemberDetails(member: HashableRoomMemberWrapper)
case presentRoomMemberDetails(userID: String)
case dismissRoomMemberDetails
case presentInviteUsersScreen
ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenCoordinator.swift
+8 -6
View File
@@ -19,13 +19,13 @@ import SwiftUI
struct RoomMemberDetailsScreenCoordinatorParameters {
let roomProxy: RoomProxyProtocol
let roomMemberProxy: RoomMemberProxyProtocol
let userID: String
let mediaProvider: MediaProviderProtocol
let userIndicatorController: UserIndicatorControllerProtocol
}
enum RoomMemberDetailsScreenCoordinatorAction {
case openDirectChat
case openDirectChat(displayName: String?)
}
final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
@@ -40,7 +40,7 @@ final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
init(parameters: RoomMemberDetailsScreenCoordinatorParameters) {
viewModel = RoomMemberDetailsScreenViewModel(roomProxy: parameters.roomProxy,
roomMemberProxy: parameters.roomMemberProxy,
userID: parameters.userID,
mediaProvider: parameters.mediaProvider,
userIndicatorController: parameters.userIndicatorController)
}
@@ -50,14 +50,16 @@ final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
guard let self else { return }
switch action {
case .openDirectChat:
actionsSubject.send(.openDirectChat)
case .openDirectChat(let displayName):
actionsSubject.send(.openDirectChat(displayName: displayName))
}
}
.store(in: &cancellables)
}
func stop() { viewModel.stop() }
func stop() {
viewModel.stop()
}
func toPresentable() -> AnyView {
AnyView(RoomMemberDetailsScreen(context: viewModel.context))
ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift
+3 -2
View File
@@ -17,11 +17,12 @@
import Foundation
enum RoomMemberDetailsScreenViewModelAction {
case openDirectChat
case openDirectChat(displayName: String?)
}
struct RoomMemberDetailsScreenViewState: BindableState {
var details: RoomMemberDetails
let userID: String
var memberDetails: RoomMemberDetails?
var isProcessingIgnoreRequest = false
var bindings: RoomMemberDetailsScreenViewStateBindings
ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift
+59 -8
View File
@@ -21,29 +21,46 @@ typealias RoomMemberDetailsScreenViewModelType = StateStoreViewModel<RoomMemberD
class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, RoomMemberDetailsScreenViewModelProtocol {
private let roomProxy: RoomProxyProtocol
private let roomMemberProxy: RoomMemberProxyProtocol
private let userID: String
private let mediaProvider: MediaProviderProtocol
private let userIndicatorController: UserIndicatorControllerProtocol
private var actionsSubject: PassthroughSubject<RoomMemberDetailsScreenViewModelAction, Never> = .init()
private var roomMemberProxy: RoomMemberProxyProtocol?
var actions: AnyPublisher<RoomMemberDetailsScreenViewModelAction, Never> {
actionsSubject.eraseToAnyPublisher()
}
init(roomProxy: RoomProxyProtocol,
roomMemberProxy: RoomMemberProxyProtocol,
userID: String,
mediaProvider: MediaProviderProtocol,
userIndicatorController: UserIndicatorControllerProtocol) {
self.roomProxy = roomProxy
self.roomMemberProxy = roomMemberProxy
self.userID = userID
self.mediaProvider = mediaProvider
self.userIndicatorController = userIndicatorController
let initialViewState = RoomMemberDetailsScreenViewState(details: RoomMemberDetails(withProxy: roomMemberProxy),
bindings: .init())
let initialViewState = RoomMemberDetailsScreenViewState(userID: userID, bindings: .init())
super.init(initialViewState: initialViewState, imageProvider: mediaProvider)
showMemberLoadingIndicator()
Task {
defer {
hideMemberLoadingIndicator()
}
switch await roomProxy.getMember(userID: userID) {
case .success(let member):
roomMemberProxy = member
state.memberDetails = RoomMemberDetails(withProxy: member)
case .failure(let error):
state.bindings.alertInfo = .init(id: .unknown)
MXLog.error("[RoomFlowCoordinator] Failed to get member: \(error)")
}
}
}
// MARK: - Public
@@ -51,6 +68,8 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
func stop() {
// Work around QLPreviewController dismissal issues, see the InteractiveQuickLookModifier.
state.bindings.mediaPreviewItem = nil
hideMemberLoadingIndicator()
}
override func process(viewAction: RoomMemberDetailsScreenViewAction) {
@@ -66,7 +85,11 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
case .displayAvatar:
displayFullScreenAvatar()
case .openDirectChat:
actionsSubject.send(.openDirectChat)
guard let roomMemberProxy else {
fatalError()
}
actionsSubject.send(.openDirectChat(displayName: roomMemberProxy.displayName))
}
}
@@ -74,12 +97,16 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
@MainActor
private func ignoreUser() async {
guard let roomMemberProxy else {
fatalError()
}
state.isProcessingIgnoreRequest = true
let result = await roomMemberProxy.ignoreUser()
state.isProcessingIgnoreRequest = false
switch result {
case .success:
state.details.isIgnored = true
state.memberDetails?.isIgnored = true
updateMembers()
case .failure:
state.bindings.alertInfo = .init(id: .unknown)
@@ -88,12 +115,16 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
@MainActor
private func unignoreUser() async {
guard let roomMemberProxy else {
fatalError()
}
state.isProcessingIgnoreRequest = true
let result = await roomMemberProxy.unignoreUser()
state.isProcessingIgnoreRequest = false
switch result {
case .success:
state.details.isIgnored = false
state.memberDetails?.isIgnored = false
updateMembers()
case .failure:
state.bindings.alertInfo = .init(id: .unknown)
@@ -107,6 +138,10 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
}
private func displayFullScreenAvatar() {
guard let roomMemberProxy else {
fatalError()
}
guard let avatarURL = roomMemberProxy.avatarURL else {
return
}
@@ -125,4 +160,20 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
}
}
}
// MARK: Loading indicator
private static let loadingIndicatorIdentifier = "RoomMemberLoading"
private func showMemberLoadingIndicator() {
userIndicatorController.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier,
type: .modal(progress: .indeterminate, interactiveDismissDisabled: false, allowsInteraction: true),
title: L10n.commonLoading,
persistent: true),
delay: .milliseconds(100))
}
private func hideMemberLoadingIndicator() {
userIndicatorController.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
}
}
ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModelProtocol.swift
+1
View File
@@ -20,5 +20,6 @@ import Combine
protocol RoomMemberDetailsScreenViewModelProtocol {
var actions: AnyPublisher<RoomMemberDetailsScreenViewModelAction, Never> { get }
var context: RoomMemberDetailsScreenViewModelType.Context { get }
func stop()
}
ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
+71 -49
View File
@@ -21,42 +21,58 @@ struct RoomMemberDetailsScreen: View {
@ObservedObject var context: RoomMemberDetailsScreenViewModel.Context
var body: some View {
content
.compoundList()
.alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
.alert(item: $context.alertInfo)
.track(screen: .User)
.interactiveQuickLook(item: $context.mediaPreviewItem, shouldHideControls: true)
}
// MARK: - Private
@ViewBuilder
private var content: some View {
Form {
headerSection
if !context.viewState.details.isAccountOwner {
if let memberDetails = context.viewState.memberDetails,
!memberDetails.isAccountOwner {
directChatSection
blockUserSection
}
}
.compoundList()
.alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
.alert(item: $context.alertInfo)
.track(screen: .User)
.interactiveQuickLook(item: $context.mediaPreviewItem, shouldHideControls: true)
}
// MARK: - Private
@ViewBuilder
private var headerSection: some View {
AvatarHeaderView(avatarUrl: context.viewState.details.avatarURL,
name: context.viewState.details.name,
id: context.viewState.details.id,
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider,
subtitle: context.viewState.details.id) {
context.send(viewAction: .displayAvatar)
} footer: {
if let permalink = context.viewState.details.permalink {
HStack(spacing: 32) {
ShareLink(item: permalink) {
CompoundIcon(\.shareIos)
if let memberDetails = context.viewState.memberDetails {
AvatarHeaderView(avatarUrl: memberDetails.avatarURL,
name: memberDetails.name,
id: memberDetails.id,
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider,
subtitle: memberDetails.id) {
context.send(viewAction: .displayAvatar)
} footer: {
if let permalink = memberDetails.permalink {
HStack(spacing: 32) {
ShareLink(item: permalink) {
CompoundIcon(\.shareIos)
}
.buttonStyle(FormActionButtonStyle(title: L10n.actionShare))
}
.buttonStyle(FormActionButtonStyle(title: L10n.actionShare))
.padding(.top, 32)
}
.padding(.top, 32)
}
} else {
AvatarHeaderView(avatarUrl: nil,
name: nil,
id: context.viewState.userID,
avatarSize: .user(on: .memberDetails),
imageProvider: context.imageProvider,
subtitle: nil,
footer: { })
}
}
@@ -71,32 +87,27 @@ struct RoomMemberDetailsScreen: View {
}
}
@ViewBuilder
private var blockUserSection: some View {
Section {
ListRow(label: .default(title: blockUserButtonTitle,
icon: \.block,
role: context.viewState.details.isIgnored ? nil : .destructive),
details: .isWaiting(context.viewState.isProcessingIgnoreRequest),
kind: .button {
context.send(viewAction: blockUserButtonAction)
})
.accessibilityIdentifier(blockUserButtonAccessibilityIdentifier)
.disabled(context.viewState.isProcessingIgnoreRequest)
if let memberDetails = context.viewState.memberDetails {
let title = memberDetails.isIgnored ? L10n.screenRoomMemberDetailsUnblockUser : L10n.screenRoomMemberDetailsBlockUser
let action: RoomMemberDetailsScreenViewAction = memberDetails.isIgnored ? .showUnignoreAlert : .showIgnoreAlert
let accessibilityIdentifier = memberDetails.isIgnored ? A11yIdentifiers.roomMemberDetailsScreen.unignore : A11yIdentifiers.roomMemberDetailsScreen.ignore
Section {
ListRow(label: .default(title: title,
icon: \.block,
role: memberDetails.isIgnored ? nil : .destructive),
details: .isWaiting(context.viewState.isProcessingIgnoreRequest),
kind: .button {
context.send(viewAction: action)
})
.accessibilityIdentifier(accessibilityIdentifier)
.disabled(context.viewState.isProcessingIgnoreRequest)
}
}
}
private var blockUserButtonAction: RoomMemberDetailsScreenViewAction {
context.viewState.details.isIgnored ? .showUnignoreAlert : .showIgnoreAlert
}
private var blockUserButtonTitle: String {
context.viewState.details.isIgnored ? L10n.screenRoomMemberDetailsUnblockUser : L10n.screenRoomMemberDetailsBlockUser
}
private var blockUserButtonAccessibilityIdentifier: String {
context.viewState.details.isIgnored ? A11yIdentifiers.roomMemberDetailsScreen.unignore : A11yIdentifiers.roomMemberDetailsScreen.ignore
}
@ViewBuilder
private func blockUserAlertActions(_ item: RoomMemberDetailsScreenViewStateBindings.IgnoreUserAlertItem) -> some View {
Button(item.cancelTitle, role: .cancel) { }
@@ -114,27 +125,35 @@ struct RoomMemberDetailsScreen: View {
// MARK: - Previews
struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
static let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
static let otherUserViewModel = {
let member = RoomMemberProxyMock.mockDan
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
roomProxyMock.getMemberUserIDReturnValue = .success(member)
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
roomMemberProxy: member,
userID: member.userID,
mediaProvider: MockMediaProvider(),
userIndicatorController: ServiceLocator.shared.userIndicatorController)
}()
static let accountOwnerViewModel = {
let member = RoomMemberProxyMock.mockMe
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
roomProxyMock.getMemberUserIDReturnValue = .success(member)
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
roomMemberProxy: member,
userID: member.userID,
mediaProvider: MockMediaProvider(),
userIndicatorController: ServiceLocator.shared.userIndicatorController)
}()
static let ignoredUserViewModel = {
let member = RoomMemberProxyMock.mockIgnored
let roomProxyMock = RoomProxyMock(with: .init(displayName: ""))
roomProxyMock.getMemberUserIDReturnValue = .success(member)
return RoomMemberDetailsScreenViewModel(roomProxy: roomProxyMock,
roomMemberProxy: member,
userID: member.userID,
mediaProvider: MockMediaProvider(),
userIndicatorController: ServiceLocator.shared.userIndicatorController)
}()
@@ -142,9 +161,12 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
RoomMemberDetailsScreen(context: otherUserViewModel.context)
.previewDisplayName("Other User")
.snapshot(delay: 0.25)
RoomMemberDetailsScreen(context: accountOwnerViewModel.context)
.previewDisplayName("Account Owner")
.snapshot(delay: 0.25)
RoomMemberDetailsScreen(context: ignoredUserViewModel.context)
.previewDisplayName("Ignored User")
.snapshot(delay: 0.25)
}
}
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenCoordinator.swift
+4
View File
@@ -57,6 +57,10 @@ final class RoomMembersListScreenCoordinator: CoordinatorProtocol {
}
.store(in: &cancellables)
}
func stop() {
viewModel.stop()
}
func toPresentable() -> AnyView {
AnyView(RoomMembersListScreen(context: viewModel.context))
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenViewModel.swift
+9 -1
View File
@@ -58,6 +58,10 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
}
}
func stop() {
hideLoader()
}
// MARK: - Private
private func setupMembers() {
@@ -120,7 +124,11 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
private let userIndicatorID = UUID().uuidString
private func showLoader() {
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID, type: .modal, title: L10n.commonLoading, persistent: true), delay: .milliseconds(200))
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
type: .modal(progress: .indeterminate, interactiveDismissDisabled: false, allowsInteraction: true),
title: L10n.commonLoading,
persistent: true),
delay: .milliseconds(200))
}
private func hideLoader() {
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenViewModelProtocol.swift
+2
View File
@@ -20,4 +20,6 @@ import Combine
protocol RoomMembersListScreenViewModelProtocol {
var actions: AnyPublisher<RoomMembersListScreenViewModelAction, Never> { get }
var context: RoomMembersListScreenViewModelType.Context { get }
func stop()
}
ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
+3 -3
View File
@@ -39,7 +39,7 @@ enum RoomScreenCoordinatorAction {
case presentPollForm(mode: PollFormMode)
case presentLocationViewer(body: String, geoURI: GeoURI, description: String?)
case presentEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
case presentRoomMemberDetails(member: RoomMemberProxyProtocol)
case presentRoomMemberDetails(userID: String)
case presentMessageForwarding(itemID: TimelineItemIdentifier)
case presentCallScreen
}
@@ -105,8 +105,8 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
actionsSubject.send(.presentPollForm(mode: mode))
case .displayMediaUploadPreviewScreen(let url):
actionsSubject.send(.presentMediaUploadPreviewScreen(url))
case .displayRoomMemberDetails(let member):
actionsSubject.send(.presentRoomMemberDetails(member: member))
case .displayRoomMemberDetails(userID: let userID):
actionsSubject.send(.presentRoomMemberDetails(userID: userID))
case .displayMessageForwarding(let itemID):
actionsSubject.send(.presentMessageForwarding(itemID: itemID))
case .displayLocation(let body, let geoURI, let description):
ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift
+2 -30
View File
@@ -25,7 +25,7 @@ enum RoomScreenInteractionHandlerAction {
case displayMessageForwarding(itemID: TimelineItemIdentifier)
case displayMediaUploadPreviewScreen(url: URL)
case displayPollForm(mode: PollFormMode)
case displayRoomMemberDetails(member: RoomMemberProxyProtocol)
case displayRoomMemberDetails(userID: String)
case showActionMenu(TimelineItemActionMenuInfo)
case showDebugInfo(TimelineItemDebugInfo)
case showConfirmationAlert(AlertInfo<UUID>)
@@ -579,19 +579,7 @@ class RoomScreenInteractionHandler {
}
func handleTappedUser(userID: String) async {
// This is generally fast but it could take some time for rooms with thousands of users on first load
// Show a loader only if it takes more than 0.1 seconds
showLoadingIndicator(with: .milliseconds(100))
let result = await roomProxy.getMember(userID: userID)
hideLoadingIndicator()
switch result {
case .success(let member):
actionsSubject.send(.displayRoomMemberDetails(member: member))
case .failure(let error):
actionsSubject.send(.displayError(.alert(L10n.screenRoomErrorFailedRetrievingUserDetails)))
MXLog.error("Failed retrieving the user given the following id \(userID) with error: \(error)")
}
actionsSubject.send(.displayRoomMemberDetails(userID: userID))
}
func processItemTap(_ itemID: TimelineItemIdentifier) async -> RoomTimelineControllerAction {
@@ -660,22 +648,6 @@ class RoomScreenInteractionHandler {
return .none
}
}
// MARK: User indicators
private static let loadingIndicatorIdentifier = "RoomScreenLoadingIndicator"
private func showLoadingIndicator(with delay: Duration) {
userIndicatorController.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier,
type: .modal(progress: .indeterminate, interactiveDismissDisabled: true, allowsInteraction: false),
title: L10n.commonLoading,
persistent: true),
delay: delay)
}
private func hideLoadingIndicator() {
userIndicatorController.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
}
}
private struct ReplyInfo {
ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
+1 -1
View File
@@ -30,7 +30,7 @@ enum RoomScreenViewModelAction {
case displayLocationPicker
case displayPollForm(mode: PollFormMode)
case displayMediaUploadPreviewScreen(url: URL)
case displayRoomMemberDetails(member: RoomMemberProxyProtocol)
case displayRoomMemberDetails(userID: String)
case displayMessageForwarding(itemID: TimelineItemIdentifier)
case displayLocation(body: String, geoURI: GeoURI, description: String?)
case composer(action: RoomScreenComposerAction)
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+2 -2
View File
@@ -337,8 +337,8 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
actionsSubject.send(.displayReportContent(itemID: itemID, senderID: senderID))
case .displayMediaUploadPreviewScreen(let url):
actionsSubject.send(.displayMediaUploadPreviewScreen(url: url))
case .displayRoomMemberDetails(let member):
actionsSubject.send(.displayRoomMemberDetails(member: member))
case .displayRoomMemberDetails(userID: let userID):
actionsSubject.send(.displayRoomMemberDetails(userID: userID))
case .showActionMenu(let actionMenuInfo):
state.bindings.actionMenuInfo = actionMenuInfo
case .showDebugInfo(let debugInfo):
ElementX/Sources/Services/Room/RoomProxy.swift
+4
View File
@@ -203,6 +203,10 @@ class RoomProxy: RoomProxyProtocol {
}
func getMember(userID: String) async -> Result<RoomMemberProxyProtocol, RoomProxyError> {
if let member = members.value.filter({ $0.userID == userID }).first {
return .success(member)
}
sendMessageBackgroundTask = await backgroundTaskService.startBackgroundTask(withName: backgroundTaskName, isReusable: true)
defer {
sendMessageBackgroundTask?.stop()
ElementX/Sources/UITests/UITestsAppCoordinator.swift
+18 -6
View File
@@ -765,25 +765,37 @@ class MockScreen: Identifiable {
navigationStackCoordinator.setRootCoordinator(coordinator)
return navigationStackCoordinator
case .roomMemberDetailsAccountOwner:
let member = RoomMemberProxyMock.mockMe
let roomProxy = RoomProxyMock(with: .init(displayName: ""))
roomProxy.getMemberUserIDReturnValue = .success(member)
let navigationStackCoordinator = NavigationStackCoordinator()
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: RoomProxyMock(with: .init(displayName: "")),
roomMemberProxy: RoomMemberProxyMock.mockMe,
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: roomProxy,
userID: member.userID,
mediaProvider: MockMediaProvider(),
userIndicatorController: ServiceLocator.shared.userIndicatorController))
navigationStackCoordinator.setRootCoordinator(coordinator)
return navigationStackCoordinator
case .roomMemberDetails:
let member = RoomMemberProxyMock.mockAlice
let roomProxy = RoomProxyMock(with: .init(displayName: ""))
roomProxy.getMemberUserIDReturnValue = .success(member)
let navigationStackCoordinator = NavigationStackCoordinator()
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: RoomProxyMock(with: .init(displayName: "")),
roomMemberProxy: RoomMemberProxyMock.mockAlice,
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: roomProxy,
userID: member.userID,
mediaProvider: MockMediaProvider(),
userIndicatorController: ServiceLocator.shared.userIndicatorController))
navigationStackCoordinator.setRootCoordinator(coordinator)
return navigationStackCoordinator
case .roomMemberDetailsIgnoredUser:
let member = RoomMemberProxyMock.mockIgnored
let roomProxy = RoomProxyMock(with: .init(displayName: ""))
roomProxy.getMemberUserIDReturnValue = .success(member)
let navigationStackCoordinator = NavigationStackCoordinator()
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: RoomProxyMock(with: .init(displayName: "")),
roomMemberProxy: RoomMemberProxyMock.mockIgnored,
let coordinator = RoomMemberDetailsScreenCoordinator(parameters: .init(roomProxy: roomProxy,
userID: member.userID,
mediaProvider: MockMediaProvider(),
userIndicatorController: ServiceLocator.shared.userIndicatorController))
navigationStackCoordinator.setRootCoordinator(coordinator)