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

vector-im/element-meta/issues/2206 - Fix room avatars not showing up on the message forwarding screen

Browse Source
This commit is contained in:
Stefan Ceriu 2023-11-24 17:34:15 +02:00 committed by Stefan Ceriu
parent 9a52dcf9ac
commit 4447829618
8 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
View File

@ -749,6 +749,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
let messageForwardingNavigationStackCoordinator = NavigationStackCoordinator()
let parameters = MessageForwardingScreenCoordinatorParameters(roomSummaryProvider: roomSummaryProvider,
mediaProvider: userSession.mediaProvider,
sourceRoomID: roomProxy.id)
let coordinator = MessageForwardingScreenCoordinator(parameters: parameters)

2
ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenCoordinator.swift
View File

@ -19,6 +19,7 @@ import SwiftUI
struct MessageForwardingScreenCoordinatorParameters {
let roomSummaryProvider: RoomSummaryProviderProtocol
let mediaProvider: MediaProviderProtocol
let sourceRoomID: String
}
@ -41,6 +42,7 @@ final class MessageForwardingScreenCoordinator: CoordinatorProtocol {
self.parameters = parameters
viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: parameters.roomSummaryProvider,
mediaProvider: parameters.mediaProvider,
sourceRoomID: parameters.sourceRoomID)
}

3
ElementX/Sources/Screens/MessageForwardingScreen/MessageForwardingScreenViewModel.swift
View File

@ -30,11 +30,12 @@ class MessageForwardingScreenViewModel: MessageForwardingScreenViewModelType, Me
}
init(roomSummaryProvider: RoomSummaryProviderProtocol,
mediaProvider: MediaProviderProtocol,
sourceRoomID: String) {
self.roomSummaryProvider = roomSummaryProvider
self.sourceRoomID = sourceRoomID
super.init(initialViewState: MessageForwardingScreenViewState())
super.init(initialViewState: MessageForwardingScreenViewState(), imageProvider: mediaProvider)
roomSummaryProvider.roomListPublisher
.receive(on: DispatchQueue.main)

4
ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift
View File

@ -108,7 +108,9 @@ private struct MessageForwardingRoomCell: View {
struct MessageForwardingScreen_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
let summaryProvider = MockRoomSummaryProvider(state: .loaded(.mockRooms))
let viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: summaryProvider, sourceRoomID: "")
let viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: summaryProvider,
mediaProvider: MockMediaProvider(),
sourceRoomID: "")
NavigationStack {
MessageForwardingScreen(context: viewModel.context)

4
UnitTests/Sources/MessageForwardingScreenViewModelTests.swift
View File

@ -27,7 +27,9 @@ class MessageForwardingScreenViewModelTests: XCTestCase {
override func setUpWithError() throws {
cancellables.removeAll()
viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: MockRoomSummaryProvider(state: .loaded(.mockRooms)), sourceRoomID: "1")
viewModel = MessageForwardingScreenViewModel(roomSummaryProvider: MockRoomSummaryProvider(state: .loaded(.mockRooms)),
mediaProvider: MockMediaProvider(),
sourceRoomID: "1")
context = viewModel.context
}

BIN
UnitTests/__Snapshots__/PreviewTests/test_messageForwardingScreen.1.png (Stored with Git LFS)
View File

Binary file not shown.

0
changelog.d/pr-2213.change → changelog.d/pr-2165.change
View File

1
changelog.d/pr-2168.bugfix Normal file
View File

@ -0,0 +1 @@
Fix room avatars not showing up on the message forwarding screen