diff --git a/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift b/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift index 774e60f1e..046c20c79 100644 --- a/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift +++ b/Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift @@ -194,7 +194,6 @@ final class RoomInfoCoordinator: NSObject, RoomInfoCoordinatorType { } private func push(coordinator: Coordinator & Presentable, animated: Bool = true) { - coordinator.start() self.add(childCoordinator: coordinator) navigationRouter.push(coordinator, animated: animated) { self.remove(childCoordinator: coordinator) diff --git a/RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift b/RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift index 0cdf3629a..b9129a6e9 100644 --- a/RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift @@ -26,9 +26,6 @@ final class PollHistoryCoordinator: Coordinator, Presentable { private let pollHistoryHostingController: UIViewController private var pollHistoryViewModel: PollHistoryViewModelProtocol - private var indicatorPresenter: UserIndicatorTypePresenterProtocol - private var loadingIndicator: UserIndicator? - // Must be used only internally var childCoordinators: [Coordinator] = [] var completion: (() -> Void)? @@ -41,8 +38,6 @@ final class PollHistoryCoordinator: Coordinator, Presentable { let view = PollHistory(viewModel: viewModel.context) pollHistoryViewModel = viewModel pollHistoryHostingController = VectorHostingController(rootView: view) - - indicatorPresenter = UserIndicatorTypePresenter(presentingViewController: pollHistoryHostingController) } // MARK: - Public @@ -57,19 +52,4 @@ final class PollHistoryCoordinator: Coordinator, Presentable { func toPresentable() -> UIViewController { pollHistoryHostingController } - - // MARK: - Private - - /// Show an activity indicator whilst loading. - /// - Parameters: - /// - label: The label to show on the indicator. - /// - isInteractionBlocking: Whether the indicator should block any user interaction. - private func startLoading(label: String = VectorL10n.loading, isInteractionBlocking: Bool = true) { - loadingIndicator = indicatorPresenter.present(.loading(label: label, isInteractionBlocking: isInteractionBlocking)) - } - - /// Hide the currently displayed activity indicator. - private func stopLoading() { - loadingIndicator = nil - } } diff --git a/changelog.d/pr-7267.change b/changelog.d/pr-7267.change new file mode 100644 index 000000000..cab02bc6a --- /dev/null +++ b/changelog.d/pr-7267.change @@ -0,0 +1 @@ +Polls: add UI for active poll history.