Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed view from viewModel

Browse source
This commit is contained in:
Flavio Alescio 2023-02-01 12:41:05 +01:00
parent 99a5fee6bc
commit 593dbab38f
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RiotSwiftUI/Modules/Room/PollHistory/PollHistoryDetail/Coordinator/PollHistoryDetailCoordinator.swift
View file

@ -38,8 +38,8 @@ final class PollHistoryDetailCoordinator: Coordinator, Presentable {
self.parameters = parameters
let timelinePollCoordinator = try TimelinePollCoordinator(parameters: .init(session: parameters.room.mxSession, room: parameters.room, pollEvent: parameters.event))
let viewModel = PollHistoryDetailViewModel(timelinePollView: timelinePollCoordinator.toView(), poll: parameters.poll)
let view = PollHistoryDetail(viewModel: viewModel.context)
let viewModel = PollHistoryDetailViewModel(poll: parameters.poll)
let view = PollHistoryDetail(viewModel: viewModel.context, contentPoll: timelinePollCoordinator.toView())
pollHistoryDetailViewModel = viewModel
pollHistoryDetailHostingController = VectorHostingController(rootView: view)
add(childCoordinator: timelinePollCoordinator)

4
RiotSwiftUI/Modules/Room/PollHistory/PollHistoryDetail/MockPollHistoryDetailScreenState.swift
View file

@ -49,8 +49,8 @@ enum MockPollHistoryDetailScreenState: MockScreenState, CaseIterable {
var screenView: ([Any], AnyView) {
let timelineViewModel = TimelinePollViewModel(timelinePollDetails: poll)
let viewModel = PollHistoryDetailViewModel(timelinePollView: TimelinePollView(viewModel: timelineViewModel.context), poll: poll)
let viewModel = PollHistoryDetailViewModel(poll: poll)
return ([viewModel], AnyView(PollHistoryDetail(viewModel: viewModel.context)))
return ([viewModel], AnyView(PollHistoryDetail(viewModel: viewModel.context, contentPoll: TimelinePollView(viewModel: timelineViewModel.context))))
}
}

1
RiotSwiftUI/Modules/Room/PollHistory/PollHistoryDetail/PollHistoryDetailModels.swift
View file

@ -29,7 +29,6 @@ enum PollHistoryDetailViewModelResult {
// MARK: View
struct PollHistoryDetailViewState: BindableState {
var timelinePollView: any View
var poll: TimelinePollDetails
var pollStartDate: Date {
poll.startDate

4
RiotSwiftUI/Modules/Room/PollHistory/PollHistoryDetail/PollHistoryDetailViewModel.swift
View file

@ -26,8 +26,8 @@ class PollHistoryDetailViewModel: PollHistoryDetailViewModelType, PollHistoryDet
// MARK: - Setup
init(timelinePollView: any View, poll: TimelinePollDetails) {
super.init(initialViewState: PollHistoryDetailViewState(timelinePollView: timelinePollView, poll: poll))
init(poll: TimelinePollDetails) {
super.init(initialViewState: PollHistoryDetailViewState(poll: poll))
}
// MARK: - Public

2
RiotSwiftUI/Modules/Room/PollHistory/PollHistoryDetail/Test/Unit/PollHistoryDetailViewModelTests.swift
View file

@ -43,7 +43,7 @@ class PollHistoryDetailViewModelTests: XCTestCase {
hasBeenEdited: false,
hasDecryptionError: false)
viewModel = PollHistoryDetailViewModel(timelineViewModel: TimelinePollViewModel(timelinePollDetails: timelinePoll))
viewModel = PollHistoryDetailViewModel(poll: timelinePoll)
context = viewModel.context
}

3
RiotSwiftUI/Modules/Room/PollHistory/PollHistoryDetail/View/PollHistoryDetail.swift
View file

@ -24,6 +24,7 @@ struct PollHistoryDetail: View {
// MARK: Public
@ObservedObject var viewModel: PollHistoryDetailViewModel.Context
var contentPoll: any View
var body: some View {
navigation
@ -49,7 +50,7 @@ struct PollHistoryDetail: View {
.font(theme.fonts.caption1)
.padding([.top])
.accessibilityIdentifier("PollHistoryDetail.date")
AnyView(viewModel.viewState.timelinePollView)
AnyView(contentPoll)
.navigationTitle(navigationTitle)
.navigationBarTitleDisplayMode(.inline)
.navigationBarBackButtonHidden(true)