Merge branch 'develop' into yostyle/voice_broadcast_playing

RiotSwiftUI/Modules/Room/Composer/Model/ComposerViewState.swift

@@ -19,6 +19,7 @@ import Foundation
 struct ComposerViewState: BindableState {
     var eventSenderDisplayName: String?
     var sendMode: ComposerSendMode = .send
+    var placeholder: String?
 }
 
 extension ComposerViewState {

RiotSwiftUI/Modules/Room/Composer/Test/Unit/ComposerViewModelTests.swift

@@ -63,4 +63,10 @@ final class ComposerViewModelTests: XCTestCase {
         context.send(viewAction: .cancel)
         XCTAssert(result == .cancel)
     }
+    
+    func testPlaceholder() {
+        XCTAssert(context.viewState.placeholder == nil)
+        viewModel.placeholder = "Placeholder Test"
+        XCTAssert(context.viewState.placeholder == "Placeholder Test")
+    }
 }

RiotSwiftUI/Modules/Room/Composer/View/Composer.swift

@@ -111,6 +111,7 @@ struct Composer: View {
                     didUpdateText: wysiwygViewModel.didUpdateText
                 )
                 .tintColor(theme.colors.accent)
+                .placeholder(viewModel.viewState.placeholder, color: theme.colors.tertiaryContent)
                 .frame(height: wysiwygViewModel.idealHeight)
                 .padding(.horizontal, horizontalPadding)
                 .onAppear {

RiotSwiftUI/Modules/Room/Composer/ViewModel/ComposerViewModel.swift

@@ -45,6 +45,15 @@ final class ComposerViewModel: ComposerViewModelType, ComposerViewModelProtocol
         }
     }
     
+    var placeholder: String? {
+        get {
+            state.placeholder
+        }
+        set {
+            state.placeholder = newValue
+        }
+    }
+    
     // MARK: - Public
     
     override func process(viewAction: ComposerViewAction) {

RiotSwiftUI/Modules/Room/Composer/ViewModel/ComposerViewModelProtocol.swift

@@ -21,4 +21,5 @@ protocol ComposerViewModelProtocol {
     var callback: ((ComposerViewModelResult) -> Void)? { get set }
     var sendMode: ComposerSendMode { get set }
     var eventSenderDisplayName: String? { get set }
+    var placeholder: String? { get set }
 }

RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift

@@ -84,8 +84,7 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
     func start() { }
     
     func toPresentable() -> UIViewController {
-        VectorHostingController(rootView: TimelinePollView(viewModel: viewModel.context),
-                                forceZeroSafeAreaInsets: true)
+        VectorHostingController(rootView: TimelinePollView(viewModel: viewModel.context))
     }
     
     func canEndPoll() -> Bool {

RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollProvider.swift

@@ -26,13 +26,13 @@ class TimelinePollProvider {
     
     /// Create or retrieve the poll timeline coordinator for this event and return
     /// a view to be displayed in the timeline
-    func buildTimelinePollViewForEvent(_ event: MXEvent) -> UIView? {
+    func buildTimelinePollVCForEvent(_ event: MXEvent) -> UIViewController? {
         guard let session = session, let room = session.room(withRoomId: event.roomId) else {
             return nil
         }
         
         if let coordinator = coordinatorsForEventIdentifiers[event.eventId] {
-            return coordinator.toPresentable().view
+            return coordinator.toPresentable()
         }
         
         let parameters = TimelinePollCoordinatorParameters(session: session, room: room, pollStartEvent: event)
@@ -42,7 +42,7 @@ class TimelinePollProvider {
         
         coordinatorsForEventIdentifiers[event.eventId] = coordinator
         
-        return coordinator.toPresentable().view
+        return coordinator.toPresentable()
     }
     
     /// Retrieve the poll timeline coordinator for the given event or nil if it hasn't been created yet