swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-11 13:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

RoomScreenViewModel refactor part 2 (#3169)

Browse Source
This commit is contained in:
Mauro 2024-08-14 18:03:46 +02:00 committed by GitHub
parent e3c4b3781a
commit 0bbdb05220
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 144 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
View File

@ -63,8 +63,10 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
init(parameters: RoomScreenCoordinatorParameters) { init(parameters: RoomScreenCoordinatorParameters) {
roomViewModel = RoomScreenViewModel(roomProxy: parameters.roomProxy, roomViewModel = RoomScreenViewModel(roomProxy: parameters.roomProxy,
mediaProvider: parameters.mediaProvider,
appMediator: parameters.appMediator, appMediator: parameters.appMediator,
appSettings: ServiceLocator.shared.settings) appSettings: ServiceLocator.shared.settings,
analyticsService: ServiceLocator.shared.analytics)
timelineViewModel = TimelineViewModel(roomProxy: parameters.roomProxy, timelineViewModel = TimelineViewModel(roomProxy: parameters.roomProxy,
focussedEventID: parameters.focussedEventID, focussedEventID: parameters.focussedEventID,
@ -103,8 +105,6 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
guard let self else { return } guard let self else { return }
switch action { switch action {
case .displayRoomDetails:
actionsSubject.send(.presentRoomDetails)
case .displayEmojiPicker(let itemID, let selectedEmojis): case .displayEmojiPicker(let itemID, let selectedEmojis):
actionsSubject.send(.presentEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis)) actionsSubject.send(.presentEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
case .displayReportContent(let itemID, let senderID): case .displayReportContent(let itemID, let senderID):
@ -121,7 +121,7 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
actionsSubject.send(.presentPollForm(mode: mode)) actionsSubject.send(.presentPollForm(mode: mode))
case .displayMediaUploadPreviewScreen(let url): case .displayMediaUploadPreviewScreen(let url):
actionsSubject.send(.presentMediaUploadPreviewScreen(url)) actionsSubject.send(.presentMediaUploadPreviewScreen(url))
case .displayRoomMemberDetails(userID: let userID): case .tappedOnSenderDetails(userID: let userID):
actionsSubject.send(.presentRoomMemberDetails(userID: userID)) actionsSubject.send(.presentRoomMemberDetails(userID: userID))
case .displayMessageForwarding(let forwardingItem): case .displayMessageForwarding(let forwardingItem):
actionsSubject.send(.presentMessageForwarding(forwardingItem: forwardingItem)) actionsSubject.send(.presentMessageForwarding(forwardingItem: forwardingItem))
@ -129,8 +129,6 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
actionsSubject.send(.presentLocationViewer(body: body, geoURI: geoURI, description: description)) actionsSubject.send(.presentLocationViewer(body: body, geoURI: geoURI, description: description))
case .composer(let action): case .composer(let action):
composerViewModel.process(timelineAction: action) composerViewModel.process(timelineAction: action)
case .displayCallScreen:
actionsSubject.send(.presentCallScreen)
case .hasScrolled(direction: let direction): case .hasScrolled(direction: let direction):
roomViewModel.timelineHasScrolled(direction: direction) roomViewModel.timelineHasScrolled(direction: direction)
} }
@ -154,6 +152,10 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
focusOnEvent(eventID: eventID) focusOnEvent(eventID: eventID)
case .displayPinnedEventsTimeline: case .displayPinnedEventsTimeline:
actionsSubject.send(.presentPinnedEventsTimeline) actionsSubject.send(.presentPinnedEventsTimeline)
case .displayRoomDetails:
actionsSubject.send(.presentRoomDetails)
case .displayCall:
actionsSubject.send(.presentCallScreen)
} }
} }
.store(in: &cancellables) .store(in: &cancellables)

10
ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
View File

@ -20,14 +20,21 @@ import OrderedCollections
enum RoomScreenViewModelAction { enum RoomScreenViewModelAction {
case focusEvent(eventID: String) case focusEvent(eventID: String)
case displayPinnedEventsTimeline case displayPinnedEventsTimeline
case displayRoomDetails
case displayCall
} }
enum RoomScreenViewAction { enum RoomScreenViewAction {
case tappedPinnedEventsBanner case tappedPinnedEventsBanner
case viewAllPins case viewAllPins
case displayRoomDetails
case displayCall
} }
struct RoomScreenViewState: BindableState { struct RoomScreenViewState: BindableState {
var roomTitle = ""
var roomAvatar: RoomAvatar
var lastScrollDirection: ScrollDirection? var lastScrollDirection: ScrollDirection?
var isPinningEnabled = false var isPinningEnabled = false
// This is used to control the banner // This is used to control the banner
@ -36,6 +43,9 @@ struct RoomScreenViewState: BindableState {
isPinningEnabled && !pinnedEventsBannerState.isEmpty && lastScrollDirection != .top isPinningEnabled && !pinnedEventsBannerState.isEmpty && lastScrollDirection != .top
} }
var canJoinCall = false
var hasOngoingCall: Bool
var bindings: RoomScreenViewStateBindings var bindings: RoomScreenViewStateBindings
} }

46
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
View File

@ -25,6 +25,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
private let roomProxy: RoomProxyProtocol private let roomProxy: RoomProxyProtocol
private let appMediator: AppMediatorProtocol private let appMediator: AppMediatorProtocol
private let appSettings: AppSettings private let appSettings: AppSettings
private let analyticsService: AnalyticsService
private let pinnedEventStringBuilder: RoomEventStringBuilder private let pinnedEventStringBuilder: RoomEventStringBuilder
private let actionsSubject: PassthroughSubject<RoomScreenViewModelAction, Never> = .init() private let actionsSubject: PassthroughSubject<RoomScreenViewModelAction, Never> = .init()
@ -51,14 +52,21 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
} }
init(roomProxy: RoomProxyProtocol, init(roomProxy: RoomProxyProtocol,
mediaProvider: MediaProviderProtocol,
appMediator: AppMediatorProtocol, appMediator: AppMediatorProtocol,
appSettings: AppSettings) { appSettings: AppSettings,
analyticsService: AnalyticsService) {
self.roomProxy = roomProxy self.roomProxy = roomProxy
self.appMediator = appMediator self.appMediator = appMediator
self.appSettings = appSettings self.appSettings = appSettings
self.analyticsService = analyticsService
pinnedEventStringBuilder = .pinnedEventStringBuilder(userID: roomProxy.ownUserID) pinnedEventStringBuilder = .pinnedEventStringBuilder(userID: roomProxy.ownUserID)
super.init(initialViewState: .init(bindings: .init())) super.init(initialViewState: .init(roomTitle: roomProxy.roomTitle,
roomAvatar: roomProxy.avatar,
hasOngoingCall: roomProxy.hasOngoingCall,
bindings: .init()),
imageProvider: mediaProvider)
setupSubscriptions() setupSubscriptions()
} }
@ -72,6 +80,11 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
state.pinnedEventsBannerState.previousPin() state.pinnedEventsBannerState.previousPin()
case .viewAllPins: case .viewAllPins:
actionsSubject.send(.displayPinnedEventsTimeline) actionsSubject.send(.displayPinnedEventsTimeline)
case .displayRoomDetails:
actionsSubject.send(.displayRoomDetails)
case .displayCall:
actionsSubject.send(.displayCall)
analyticsService.trackInteraction(name: .MobileRoomCallButton)
} }
} }
@ -84,15 +97,25 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
.actionsPublisher .actionsPublisher
.filter { $0 == .roomInfoUpdate } .filter { $0 == .roomInfoUpdate }
roomInfoSubscription
.throttle(for: .seconds(1), scheduler: DispatchQueue.main, latest: true)
.sink { [weak self] _ in
guard let self else { return }
state.roomTitle = roomProxy.roomTitle
state.roomAvatar = roomProxy.avatar
state.hasOngoingCall = roomProxy.hasOngoingCall
}
.store(in: &cancellables)
Task { [weak self] in Task { [weak self] in
// Don't guard let self here, otherwise the for await will strongify the self reference creating a strong reference cycle. // Don't guard let self here, otherwise the for await will strongify the self reference creating a strong reference cycle.
// If the subscription has sent a value before the Task has started it might be lost, so before entering the loop we always do an update. // If the subscription has sent a value before the Task has started it might be lost, so before entering the loop we always do an update.
await self?.updatePinnedEventIDs() await self?.handleRoomInfoUpdate()
for await _ in roomInfoSubscription.receive(on: DispatchQueue.main).values { for await _ in roomInfoSubscription.receive(on: DispatchQueue.main).values {
guard !Task.isCancelled else { guard !Task.isCancelled else {
return return
} }
await self?.updatePinnedEventIDs() await self?.handleRoomInfoUpdate()
} }
} }
.store(in: &cancellables) .store(in: &cancellables)
@ -128,12 +151,17 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
state.pinnedEventsBannerState.setPinnedEventContents(pinnedEventContents) state.pinnedEventsBannerState.setPinnedEventContents(pinnedEventContents)
} }
private func updatePinnedEventIDs() async { private func handleRoomInfoUpdate() async {
let pinnedEventIDs = await roomProxy.pinnedEventIDs let pinnedEventIDs = await roomProxy.pinnedEventIDs
// Only update the loading state of the banner // Only update the loading state of the banner
if state.pinnedEventsBannerState.isLoading { if state.pinnedEventsBannerState.isLoading {
state.pinnedEventsBannerState = .loading(numbersOfEvents: pinnedEventIDs.count) state.pinnedEventsBannerState = .loading(numbersOfEvents: pinnedEventIDs.count)
} }
let userID = roomProxy.ownUserID
if case let .success(permission) = await roomProxy.canUserJoinCall(userID: userID) {
state.canJoinCall = permission
}
} }
private func setupPinnedEventsTimelineProviderIfNeeded() { private func setupPinnedEventsTimelineProviderIfNeeded() {
@ -154,10 +182,12 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
} }
extension RoomScreenViewModel { extension RoomScreenViewModel {
static func mock() -> RoomScreenViewModel { static func mock(roomProxyMock: RoomProxyMock) -> RoomScreenViewModel {
RoomScreenViewModel(roomProxy: RoomProxyMock(.init()), RoomScreenViewModel(roomProxy: roomProxyMock,
mediaProvider: MockMediaProvider(),
appMediator: AppMediatorMock.default, appMediator: AppMediatorMock.default,
appSettings: ServiceLocator.shared.settings) appSettings: ServiceLocator.shared.settings,
analyticsService: ServiceLocator.shared.analytics)
} }
} }

25
ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
View File

@ -163,29 +163,29 @@ struct RoomScreen: View {
// .principal + .primaryAction works better than .navigation leading + trailing // .principal + .primaryAction works better than .navigation leading + trailing
// as the latter disables interaction in the action button for rooms with long names // as the latter disables interaction in the action button for rooms with long names
ToolbarItem(placement: .principal) { ToolbarItem(placement: .principal) {
RoomHeaderView(roomName: timelineContext.viewState.roomTitle, RoomHeaderView(roomName: roomContext.viewState.roomTitle,
roomAvatar: timelineContext.viewState.roomAvatar, roomAvatar: roomContext.viewState.roomAvatar,
imageProvider: timelineContext.imageProvider) imageProvider: roomContext.imageProvider)
// Using a button stops it from getting truncated in the navigation bar // Using a button stops it from getting truncated in the navigation bar
.contentShape(.rect) .contentShape(.rect)
.onTapGesture { .onTapGesture {
timelineContext.send(viewAction: .displayRoomDetails) roomContext.send(viewAction: .displayRoomDetails)
} }
} }
if !ProcessInfo.processInfo.isiOSAppOnMac { if !ProcessInfo.processInfo.isiOSAppOnMac {
ToolbarItem(placement: .primaryAction) { ToolbarItem(placement: .primaryAction) {
callButton callButton
.disabled(timelineContext.viewState.canJoinCall == false) .disabled(roomContext.viewState.canJoinCall == false)
} }
} }
} }
@ViewBuilder @ViewBuilder
private var callButton: some View { private var callButton: some View {
if timelineContext.viewState.hasOngoingCall { if roomContext.viewState.hasOngoingCall {
Button { Button {
timelineContext.send(viewAction: .displayCall) roomContext.send(viewAction: .displayCall)
} label: { } label: {
Label(L10n.actionJoin, icon: \.videoCallSolid) Label(L10n.actionJoin, icon: \.videoCallSolid)
.labelStyle(.titleAndIcon) .labelStyle(.titleAndIcon)
@ -194,7 +194,7 @@ struct RoomScreen: View {
.accessibilityIdentifier(A11yIdentifiers.roomScreen.joinCall) .accessibilityIdentifier(A11yIdentifiers.roomScreen.joinCall)
} else { } else {
Button { Button {
timelineContext.send(viewAction: .displayCall) roomContext.send(viewAction: .displayCall)
} label: { } label: {
CompoundIcon(\.videoCallSolid) CompoundIcon(\.videoCallSolid)
} }
@ -210,10 +210,11 @@ struct RoomScreen: View {
// MARK: - Previews // MARK: - Previews
struct RoomScreen_Previews: PreviewProvider, TestablePreview { struct RoomScreen_Previews: PreviewProvider, TestablePreview {
static let roomViewModel = RoomScreenViewModel.mock() static let roomProxyMock = RoomProxyMock(.init(id: "stable_id",
static let timelineViewModel = TimelineViewModel(roomProxy: RoomProxyMock(.init(id: "stable_id", name: "Preview room",
name: "Preview room", hasOngoingCall: true))
hasOngoingCall: true)), static let roomViewModel = RoomScreenViewModel.mock(roomProxyMock: roomProxyMock)
static let timelineViewModel = TimelineViewModel(roomProxy: roomProxyMock,
timelineController: MockRoomTimelineController(), timelineController: MockRoomTimelineController(),
mediaProvider: MockMediaProvider(), mediaProvider: MockMediaProvider(),
mediaPlayerProvider: MediaPlayerProviderMock(), mediaPlayerProvider: MediaPlayerProviderMock(),

4
ElementX/Sources/Screens/Timeline/TimelineInteractionHandler.swift
View File

@ -503,10 +503,6 @@ class TimelineInteractionHandler {
actionsSubject.send(.displayEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis)) actionsSubject.send(.displayEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
} }
func displayRoomMemberDetails(userID: String) async {
actionsSubject.send(.displayRoomMemberDetails(userID: userID))
}
func processItemTap(_ itemID: TimelineItemIdentifier) async -> RoomTimelineControllerAction { func processItemTap(_ itemID: TimelineItemIdentifier) async -> RoomTimelineControllerAction {
guard let timelineItem = timelineController.timelineItems.firstUsingStableID(itemID) else { guard let timelineItem = timelineController.timelineItems.firstUsingStableID(itemID) else {
return .none return .none

57
ElementX/Sources/Screens/Timeline/TimelineModels.swift
View File

@ -19,7 +19,6 @@ import OrderedCollections
import SwiftUI import SwiftUI
enum TimelineViewModelAction { enum TimelineViewModelAction {
case displayRoomDetails
case displayEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>) case displayEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
case displayReportContent(itemID: TimelineItemIdentifier, senderID: String) case displayReportContent(itemID: TimelineItemIdentifier, senderID: String)
case displayCameraPicker case displayCameraPicker
@ -28,11 +27,10 @@ enum TimelineViewModelAction {
case displayLocationPicker case displayLocationPicker
case displayPollForm(mode: PollFormMode) case displayPollForm(mode: PollFormMode)
case displayMediaUploadPreviewScreen(url: URL) case displayMediaUploadPreviewScreen(url: URL)
case displayRoomMemberDetails(userID: String) case tappedOnSenderDetails(userID: String)
case displayMessageForwarding(forwardingItem: MessageForwardingItem) case displayMessageForwarding(forwardingItem: MessageForwardingItem)
case displayLocation(body: String, geoURI: GeoURI, description: String?) case displayLocation(body: String, geoURI: GeoURI, description: String?)
case composer(action: TimelineComposerAction) case composer(action: TimelineComposerAction)
case displayCallScreen
case hasScrolled(direction: ScrollDirection) case hasScrolled(direction: ScrollDirection)
} }
@ -48,41 +46,39 @@ enum TimelineAudioPlayerAction {
} }
enum TimelineViewAction { enum TimelineViewAction {
case itemAppeared(itemID: TimelineItemIdentifier) // t case itemAppeared(itemID: TimelineItemIdentifier)
case itemDisappeared(itemID: TimelineItemIdentifier) // t case itemDisappeared(itemID: TimelineItemIdentifier)
case itemTapped(itemID: TimelineItemIdentifier) // t case itemTapped(itemID: TimelineItemIdentifier)
case itemSendInfoTapped(itemID: TimelineItemIdentifier) // t case itemSendInfoTapped(itemID: TimelineItemIdentifier)
case toggleReaction(key: String, itemID: TimelineItemIdentifier) // t case toggleReaction(key: String, itemID: TimelineItemIdentifier)
case sendReadReceiptIfNeeded(TimelineItemIdentifier) // t case sendReadReceiptIfNeeded(TimelineItemIdentifier)
case paginateBackwards // t case paginateBackwards
case paginateForwards // t case paginateForwards
case scrollToBottom // t case scrollToBottom
case displayTimelineItemMenu(itemID: TimelineItemIdentifier) // t case displayTimelineItemMenu(itemID: TimelineItemIdentifier)
case handleTimelineItemMenuAction(itemID: TimelineItemIdentifier, action: TimelineItemMenuAction) // not t case handleTimelineItemMenuAction(itemID: TimelineItemIdentifier, action: TimelineItemMenuAction)
case displayRoomDetails // not t case tappedOnSenderDetails(userID: String)
case displayRoomMemberDetails(userID: String) // t -> change name case displayReactionSummary(itemID: TimelineItemIdentifier, key: String)
case displayReactionSummary(itemID: TimelineItemIdentifier, key: String) // t -> handle externally case displayEmojiPicker(itemID: TimelineItemIdentifier)
case displayEmojiPicker(itemID: TimelineItemIdentifier) // t -> handle externally case displayReadReceipts(itemID: TimelineItemIdentifier)
case displayReadReceipts(itemID: TimelineItemIdentifier) // t -> handle externally
case displayCall // not t
case handlePasteOrDrop(provider: NSItemProvider) // not t case handlePasteOrDrop(provider: NSItemProvider)
case handlePollAction(TimelineViewPollAction) // t case handlePollAction(TimelineViewPollAction)
case handleAudioPlayerAction(TimelineAudioPlayerAction) // t case handleAudioPlayerAction(TimelineAudioPlayerAction)
/// Focus the timeline onto the specified event ID (switching to a detached timeline if needed). /// Focus the timeline onto the specified event ID (switching to a detached timeline if needed).
case focusOnEventID(String) // t case focusOnEventID(String)
/// Switch back to a live timeline (from a detached one). /// Switch back to a live timeline (from a detached one).
case focusLive // t case focusLive
/// The timeline scrolled to reveal the focussed item. /// The timeline scrolled to reveal the focussed item.
case scrolledToFocussedItem // t case scrolledToFocussedItem
/// The table view has loaded the first items for a new timeline. /// The table view has loaded the first items for a new timeline.
case hasSwitchedTimeline // t case hasSwitchedTimeline
case hasScrolled(direction: ScrollDirection) // t case hasScrolled(direction: ScrollDirection)
} }
enum TimelineComposerAction { enum TimelineComposerAction {
@ -94,8 +90,6 @@ enum TimelineComposerAction {
struct TimelineViewState: BindableState { struct TimelineViewState: BindableState {
var roomID: String var roomID: String
var roomTitle = ""
var roomAvatar: RoomAvatar
var members: [String: RoomMemberState] = [:] var members: [String: RoomMemberState] = [:]
var typingMembers: [String] = [] var typingMembers: [String] = []
var showLoading = false var showLoading = false
@ -113,9 +107,6 @@ struct TimelineViewState: BindableState {
// It's updated from the room info, so it's faster than using the timeline // It's updated from the room info, so it's faster than using the timeline
var pinnedEventIDs: Set<String> = [] var pinnedEventIDs: Set<String> = []
var canJoinCall = false
var hasOngoingCall = false
var bindings: TimelineViewStateBindings var bindings: TimelineViewStateBindings
/// A closure providing the associated audio player state for an item in the timeline. /// A closure providing the associated audio player state for an item in the timeline.

32
ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
View File

@ -81,13 +81,10 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
analyticsService: analyticsService) analyticsService: analyticsService)
super.init(initialViewState: TimelineViewState(roomID: roomProxy.id, super.init(initialViewState: TimelineViewState(roomID: roomProxy.id,
roomTitle: roomProxy.roomTitle,
roomAvatar: roomProxy.avatar,
isEncryptedOneToOneRoom: roomProxy.isEncryptedOneToOneRoom, isEncryptedOneToOneRoom: roomProxy.isEncryptedOneToOneRoom,
timelineViewState: TimelineState(focussedEvent: focussedEventID.map { .init(eventID: $0, appearance: .immediate) }), timelineViewState: TimelineState(focussedEvent: focussedEventID.map { .init(eventID: $0, appearance: .immediate) }),
ownUserID: roomProxy.ownUserID, ownUserID: roomProxy.ownUserID,
isViewSourceEnabled: appSettings.viewSourceEnabled, isViewSourceEnabled: appSettings.viewSourceEnabled,
hasOngoingCall: roomProxy.hasOngoingCall,
bindings: .init(reactionsCollapsed: [:])), bindings: .init(reactionsCollapsed: [:])),
imageProvider: mediaProvider) imageProvider: mediaProvider)
@ -117,13 +114,6 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
// Note: beware if we get to e.g. restore a reply / edit, // Note: beware if we get to e.g. restore a reply / edit,
// maybe we are tracking a non-needed first initial state // maybe we are tracking a non-needed first initial state
trackComposerMode(.default) trackComposerMode(.default)
Task {
let userID = roomProxy.ownUserID
if case let .success(permission) = await roomProxy.canUserJoinCall(userID: userID) {
state.canJoinCall = permission
}
}
} }
// MARK: - Public // MARK: - Public
@ -157,19 +147,14 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
timelineInteractionHandler.displayTimelineItemActionMenu(for: itemID) timelineInteractionHandler.displayTimelineItemActionMenu(for: itemID)
case .handleTimelineItemMenuAction(let itemID, let action): case .handleTimelineItemMenuAction(let itemID, let action):
timelineInteractionHandler.handleTimelineItemMenuAction(action, itemID: itemID) timelineInteractionHandler.handleTimelineItemMenuAction(action, itemID: itemID)
case .displayRoomDetails: case .tappedOnSenderDetails(userID: let userID):
actionsSubject.send(.displayRoomDetails) actionsSubject.send(.tappedOnSenderDetails(userID: userID))
case .displayRoomMemberDetails(userID: let userID):
Task { await timelineInteractionHandler.displayRoomMemberDetails(userID: userID) }
case .displayEmojiPicker(let itemID): case .displayEmojiPicker(let itemID):
timelineInteractionHandler.displayEmojiPicker(for: itemID) timelineInteractionHandler.displayEmojiPicker(for: itemID)
case .displayReactionSummary(let itemID, let key): case .displayReactionSummary(let itemID, let key):
displayReactionSummary(for: itemID, selectedKey: key) displayReactionSummary(for: itemID, selectedKey: key)
case .displayReadReceipts(itemID: let itemID): case .displayReadReceipts(itemID: let itemID):
displayReadReceipts(for: itemID) displayReadReceipts(for: itemID)
case .displayCall:
actionsSubject.send(.displayCallScreen)
analyticsService.trackInteraction(name: .MobileRoomCallButton)
case .handlePasteOrDrop(let provider): case .handlePasteOrDrop(let provider):
timelineInteractionHandler.handlePasteOrDrop(provider) timelineInteractionHandler.handlePasteOrDrop(provider)
case .handlePollAction(let pollAction): case .handlePollAction(let pollAction):
@ -389,17 +374,6 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
let roomInfoSubscription = roomProxy let roomInfoSubscription = roomProxy
.actionsPublisher .actionsPublisher
.filter { $0 == .roomInfoUpdate } .filter { $0 == .roomInfoUpdate }
roomInfoSubscription
.throttle(for: .seconds(1), scheduler: DispatchQueue.main, latest: true)
.sink { [weak self] _ in
guard let self else { return }
state.roomTitle = roomProxy.roomTitle
state.roomAvatar = roomProxy.avatar
state.hasOngoingCall = roomProxy.hasOngoingCall
}
.store(in: &cancellables)
Task { [weak self] in Task { [weak self] in
// Don't guard let self here, otherwise the for await will strongify the self reference creating a strong reference cycle. // Don't guard let self here, otherwise the for await will strongify the self reference creating a strong reference cycle.
// If the subscription has sent a value before the Task has started it might be lost, so before entering the loop we always do an update. // If the subscription has sent a value before the Task has started it might be lost, so before entering the loop we always do an update.
@ -449,7 +423,7 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
case .displayMediaUploadPreviewScreen(let url): case .displayMediaUploadPreviewScreen(let url):
actionsSubject.send(.displayMediaUploadPreviewScreen(url: url)) actionsSubject.send(.displayMediaUploadPreviewScreen(url: url))
case .displayRoomMemberDetails(userID: let userID): case .displayRoomMemberDetails(userID: let userID):
actionsSubject.send(.displayRoomMemberDetails(userID: userID)) actionsSubject.send(.tappedOnSenderDetails(userID: userID))
case .showActionMenu(let actionMenuInfo): case .showActionMenu(let actionMenuInfo):
Task { Task {
await self.updatePermissions() await self.updatePermissions()

2
ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
View File

@ -97,7 +97,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
// sender info are read inside the `TimelineAccessibilityModifier` // sender info are read inside the `TimelineAccessibilityModifier`
.accessibilityHidden(true) .accessibilityHidden(true)
.onTapGesture { .onTapGesture {
context.send(viewAction: .displayRoomMemberDetails(userID: timelineItem.sender.id)) context.send(viewAction: .tappedOnSenderDetails(userID: timelineItem.sender.id))
} }
.padding(.top, 8) .padding(.top, 8)
} }

5
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/HighlightedTimelineItemModifier.swift
View File

@ -93,9 +93,10 @@ struct HighlightedTimelineItemModifier_Previews: PreviewProvider, TestablePrevie
/// A preview that allows quick testing of the highlight appearance across various timeline scenarios. /// A preview that allows quick testing of the highlight appearance across various timeline scenarios.
struct HighlightedTimelineItemTimeline_Previews: PreviewProvider { struct HighlightedTimelineItemTimeline_Previews: PreviewProvider {
static let roomViewModel = RoomScreenViewModel.mock() static let roomProxyMock = RoomProxyMock(.init(name: "Preview room"))
static let roomViewModel = RoomScreenViewModel.mock(roomProxyMock: roomProxyMock)
static let focussedEventID = "RoomTimelineItemFixtures.default.5" static let focussedEventID = "RoomTimelineItemFixtures.default.5"
static let timelineViewModel = TimelineViewModel(roomProxy: RoomProxyMock(.init(name: "Preview room")), static let timelineViewModel = TimelineViewModel(roomProxy: roomProxyMock,
focussedEventID: focussedEventID, focussedEventID: focussedEventID,
timelineController: MockRoomTimelineController(), timelineController: MockRoomTimelineController(),
mediaProvider: MockMediaProvider(), mediaProvider: MockMediaProvider(),

7
ElementX/Sources/Screens/Timeline/View/TimelineView.swift
View File

@ -79,9 +79,10 @@ struct TimelineView: UIViewControllerRepresentable {
// MARK: - Previews // MARK: - Previews
struct TimelineView_Previews: PreviewProvider, TestablePreview { struct TimelineView_Previews: PreviewProvider, TestablePreview {
static let roomViewModel = RoomScreenViewModel.mock() static let roomProxyMock = RoomProxyMock(.init(id: "stable_id",
static let timelineViewModel = TimelineViewModel(roomProxy: RoomProxyMock(.init(id: "stable_id", name: "Preview room"))
name: "Preview room")), static let roomViewModel = RoomScreenViewModel.mock(roomProxyMock: roomProxyMock)
static let timelineViewModel = TimelineViewModel(roomProxy: roomProxyMock,
timelineController: MockRoomTimelineController(), timelineController: MockRoomTimelineController(),
mediaProvider: MockMediaProvider(), mediaProvider: MockMediaProvider(),
mediaPlayerProvider: MediaPlayerProviderMock(), mediaPlayerProvider: MediaPlayerProviderMock(),

41
UnitTests/Sources/RoomScreenViewModelTests.swift
View File

@ -43,8 +43,10 @@ class RoomScreenViewModelTests: XCTestCase {
// setup the room proxy actions publisher // setup the room proxy actions publisher
roomProxyMock.underlyingActionsPublisher = updateSubject.eraseToAnyPublisher() roomProxyMock.underlyingActionsPublisher = updateSubject.eraseToAnyPublisher()
let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock, let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock,
mediaProvider: MockMediaProvider(),
appMediator: AppMediatorMock.default, appMediator: AppMediatorMock.default,
appSettings: ServiceLocator.shared.settings) appSettings: ServiceLocator.shared.settings,
analyticsService: ServiceLocator.shared.analytics)
self.viewModel = viewModel self.viewModel = viewModel
// check if in the default state is not showing but is indeed loading // check if in the default state is not showing but is indeed loading
@ -101,4 +103,41 @@ class RoomScreenViewModelTests: XCTestCase {
viewModel.timelineHasScrolled(direction: .bottom) viewModel.timelineHasScrolled(direction: .bottom)
XCTAssertTrue(viewModel.context.viewState.shouldShowPinnedEventsBanner) XCTAssertTrue(viewModel.context.viewState.shouldShowPinnedEventsBanner)
} }
func testRoomInfoUpdate() async throws {
let updateSubject = PassthroughSubject<RoomProxyAction, Never>()
let roomProxyMock = RoomProxyMock(.init(id: "TestID", name: "StartingName", avatarURL: nil, hasOngoingCall: false))
// setup the room proxy actions publisher
roomProxyMock.canUserJoinCallUserIDReturnValue = .success(false)
roomProxyMock.underlyingActionsPublisher = updateSubject.eraseToAnyPublisher()
let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock,
mediaProvider: MockMediaProvider(),
appMediator: AppMediatorMock.default,
appSettings: ServiceLocator.shared.settings,
analyticsService: ServiceLocator.shared.analytics)
self.viewModel = viewModel
var deferred = deferFulfillment(viewModel.context.$viewState) { viewState in
viewState.roomTitle == "StartingName" &&
viewState.roomAvatar == .room(id: "TestID", name: "StartingName", avatarURL: nil) &&
!viewState.canJoinCall &&
!viewState.hasOngoingCall
}
try await deferred.fulfill()
roomProxyMock.name = "NewName"
roomProxyMock.avatar = .room(id: "TestID", name: "NewName", avatarURL: .documentsDirectory)
roomProxyMock.hasOngoingCall = true
roomProxyMock.canUserJoinCallUserIDReturnValue = .success(true)
deferred = deferFulfillment(viewModel.context.$viewState) { viewState in
viewState.roomTitle == "NewName" &&
viewState.roomAvatar == .room(id: "TestID", name: "NewName", avatarURL: .documentsDirectory) &&
viewState.canJoinCall &&
viewState.hasOngoingCall
}
updateSubject.send(.roomInfoUpdate)
try await deferred.fulfill()
}
} }