mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-25 02:52:45 +02:00
Rename some existing voice broadcast files to VoiceBroadcastPlayback
Record will happen in separate files
This commit is contained in:
+9
-9
@@ -33,7 +33,7 @@ final class VoiceBroadcastPlaybackController: Coordinator, Presentable, VoiceBro
|
||||
private let selectedAnswerIdentifiersSubject = PassthroughSubject<[String], Never>()
|
||||
|
||||
private var voiceBroadcastAggregator: VoiceBroadcastAggregator
|
||||
private var viewModel: TimelineVoiceBroadcastViewModelProtocol!
|
||||
private var viewModel: VoiceBroadcastPlaybackViewModelProtocol!
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
||||
// MARK: Public
|
||||
@@ -49,7 +49,7 @@ final class VoiceBroadcastPlaybackController: Coordinator, Presentable, VoiceBro
|
||||
try voiceBroadcastAggregator = VoiceBroadcastAggregator(session: parameters.session, room: parameters.room, voiceBroadcastStartEventId: parameters.voiceBroadcastStartEvent.eventId)
|
||||
voiceBroadcastAggregator.delegate = self
|
||||
|
||||
viewModel = TimelineVoiceBroadcastViewModel(timelineVoiceBroadcastDetails: buildTimelineVoiceBroadcastFrom(voiceBroadcastAggregator.voiceBroadcast))
|
||||
viewModel = VoiceBroadcastPlaybackViewModel(VoiceBroadcastPlaybackDetails: buildVoiceBroadcastPlaybackFrom(voiceBroadcastAggregator.voiceBroadcast))
|
||||
|
||||
viewModel.completion = { [weak self] result in
|
||||
guard let self = self else { return }
|
||||
@@ -71,7 +71,7 @@ final class VoiceBroadcastPlaybackController: Coordinator, Presentable, VoiceBro
|
||||
func start() { }
|
||||
|
||||
func toPresentable() -> UIViewController {
|
||||
VectorHostingController(rootView: TimelineVoiceBroadcastView(viewModel: viewModel.context),
|
||||
VectorHostingController(rootView: VoiceBroadcastPlaybackView(viewModel: viewModel.context),
|
||||
forceZeroSafeAreaInsets: true)
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ final class VoiceBroadcastPlaybackController: Coordinator, Presentable, VoiceBro
|
||||
// MARK: - VoiceBroadcastAggregatorDelegate
|
||||
|
||||
func voiceBroadcastAggregatorDidUpdateData(_ aggregator: VoiceBroadcastAggregator) {
|
||||
viewModel.updateWithVoiceBroadcastDetails(buildTimelineVoiceBroadcastFrom(aggregator.voiceBroadcast))
|
||||
viewModel.updateWithVoiceBroadcastDetails(buildVoiceBroadcastPlaybackFrom(aggregator.voiceBroadcast))
|
||||
}
|
||||
|
||||
func voiceBroadcastAggregatorDidStartLoading(_ aggregator: VoiceBroadcastAggregator) { }
|
||||
@@ -102,14 +102,14 @@ final class VoiceBroadcastPlaybackController: Coordinator, Presentable, VoiceBro
|
||||
|
||||
// VoiceBroadcast is intentionally not available in the SwiftUI target as we don't want
|
||||
// to add the SDK as a dependency to it. We need to translate from one to the other on this level.
|
||||
func buildTimelineVoiceBroadcastFrom(_ voiceBroadcast: VoiceBroadcast) -> TimelineVoiceBroadcastDetails {
|
||||
func buildVoiceBroadcastPlaybackFrom(_ voiceBroadcast: VoiceBroadcast) -> VoiceBroadcastPlaybackDetails {
|
||||
|
||||
return TimelineVoiceBroadcastDetails(chunks: Array(voiceBroadcast.chunks), type: voiceBroadcastKindToTimelineVoiceBroadcastType(voiceBroadcast.kind))
|
||||
return VoiceBroadcastPlaybackDetails(type: voiceBroadcastKindToVoiceBroadcastPlaybackType(voiceBroadcast.kind), chunks: Array(voiceBroadcast.chunks))
|
||||
}
|
||||
|
||||
private func voiceBroadcastKindToTimelineVoiceBroadcastType(_ kind: VoiceBroadcastKind) -> TimelineVoiceBroadcastType {
|
||||
let mapping = [VoiceBroadcastKind.player: TimelineVoiceBroadcastType.player,
|
||||
VoiceBroadcastKind.recorder: TimelineVoiceBroadcastType.recorder]
|
||||
private func voiceBroadcastKindToVoiceBroadcastPlaybackType(_ kind: VoiceBroadcastKind) -> VoiceBroadcastPlaybackType {
|
||||
let mapping = [VoiceBroadcastKind.player: VoiceBroadcastPlaybackType.player,
|
||||
VoiceBroadcastKind.recorder: VoiceBroadcastPlaybackType.recorder]
|
||||
|
||||
return mapping[kind] ?? .player
|
||||
}
|
||||
+3
-3
@@ -16,8 +16,8 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
class TimelineVoiceBroadcastProvider {
|
||||
static let shared = TimelineVoiceBroadcastProvider()
|
||||
class VoiceBroadcastPlaybackProvider {
|
||||
static let shared = VoiceBroadcastPlaybackProvider()
|
||||
|
||||
var session: MXSession?
|
||||
var coordinatorsForEventIdentifiers = [String: VoiceBroadcastPlaybackController]()
|
||||
@@ -26,7 +26,7 @@ class TimelineVoiceBroadcastProvider {
|
||||
|
||||
/// Create or retrieve the voiceBroadcast timeline coordinator for this event and return
|
||||
/// a view to be displayed in the timeline
|
||||
func buildTimelineVoiceBroadcastViewForEvent(_ event: MXEvent) -> UIView? {
|
||||
func buildVoiceBroadcastPlaybackViewForEvent(_ event: MXEvent) -> UIView? {
|
||||
guard let session = session, let room = session.room(withRoomId: event.roomId) else {
|
||||
return nil
|
||||
}
|
||||
+4
-4
@@ -16,7 +16,7 @@
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct TimelineVoiceBroadcastView: View {
|
||||
struct VoiceBroadcastPlaybackView: View {
|
||||
// MARK: - Properties
|
||||
|
||||
// MARK: Private
|
||||
@@ -25,7 +25,7 @@ struct TimelineVoiceBroadcastView: View {
|
||||
|
||||
// MARK: Public
|
||||
|
||||
@ObservedObject var viewModel: TimelineVoiceBroadcastViewModel.Context
|
||||
@ObservedObject var viewModel: VoiceBroadcastPlaybackViewModel.Context
|
||||
|
||||
var body: some View {
|
||||
let voiceBroadcast = viewModel.viewState.voiceBroadcast
|
||||
@@ -64,8 +64,8 @@ struct TimelineVoiceBroadcastView: View {
|
||||
|
||||
// MARK: - Previews
|
||||
|
||||
struct TimelineVoiceBroadcastView_Previews: PreviewProvider {
|
||||
static let stateRenderer = MockTimelineVoiceBroadcastScreenState.stateRenderer
|
||||
struct VoiceBroadcastPlaybackView_Previews: PreviewProvider {
|
||||
static let stateRenderer = MockVoiceBroadcastPlaybackScreenState.stateRenderer
|
||||
static var previews: some View {
|
||||
stateRenderer.screenGroup()
|
||||
}
|
||||
+11
-11
@@ -17,39 +17,39 @@
|
||||
import Foundation
|
||||
import SwiftUI
|
||||
|
||||
enum TimelineVoiceBroadcastViewAction {
|
||||
enum VoiceBroadcastPlaybackViewAction {
|
||||
case play
|
||||
case pause
|
||||
}
|
||||
|
||||
enum TimelineVoiceBroadcastViewModelResult {
|
||||
enum VoiceBroadcastPlaybackViewModelResult {
|
||||
// TODO: VB send all chunk file urls from ViewModel
|
||||
case played
|
||||
case paused
|
||||
}
|
||||
|
||||
enum TimelineVoiceBroadcastType {
|
||||
enum VoiceBroadcastPlaybackType {
|
||||
case player
|
||||
case recorder
|
||||
}
|
||||
|
||||
struct TimelineVoiceBroadcastDetails {
|
||||
var type: TimelineVoiceBroadcastType
|
||||
struct VoiceBroadcastPlaybackDetails {
|
||||
var type: VoiceBroadcastPlaybackType
|
||||
var chunks: [VoiceBroadcastChunk]
|
||||
|
||||
// TODO: VB Add playback state
|
||||
}
|
||||
|
||||
struct TimelineVoiceBroadcastViewState: BindableState {
|
||||
var voiceBroadcast: TimelineVoiceBroadcastDetails
|
||||
var bindings: TimelineVoiceBroadcastViewStateBindings
|
||||
struct VoiceBroadcastPlaybackViewState: BindableState {
|
||||
var voiceBroadcast: VoiceBroadcastPlaybackDetails
|
||||
var bindings: VoiceBroadcastPlaybackViewStateBindings
|
||||
}
|
||||
|
||||
struct TimelineVoiceBroadcastViewStateBindings {
|
||||
var alertInfo: AlertInfo<TimelineVoiceBroadcastAlertType>?
|
||||
struct VoiceBroadcastPlaybackViewStateBindings {
|
||||
var alertInfo: AlertInfo<VoiceBroadcastPlaybackAlertType>?
|
||||
}
|
||||
|
||||
enum TimelineVoiceBroadcastAlertType {
|
||||
enum VoiceBroadcastPlaybackAlertType {
|
||||
case failedClosingVoiceBroadcast
|
||||
}
|
||||
|
||||
+6
-6
@@ -19,7 +19,7 @@ import SwiftUI
|
||||
|
||||
/// Using an enum for the screen allows you define the different state cases with
|
||||
/// the relevant associated data for each case.
|
||||
enum MockTimelineVoiceBroadcastScreenState: MockScreenState, CaseIterable {
|
||||
enum MockVoiceBroadcastPlaybackScreenState: MockScreenState, CaseIterable {
|
||||
// A case for each state you want to represent
|
||||
// with specific, minimal associated data that will allow you
|
||||
// mock that screen.
|
||||
@@ -27,23 +27,23 @@ enum MockTimelineVoiceBroadcastScreenState: MockScreenState, CaseIterable {
|
||||
|
||||
/// The associated screen
|
||||
var screenType: Any.Type {
|
||||
TimelineVoiceBroadcastView.self
|
||||
VoiceBroadcastPlaybackView.self
|
||||
}
|
||||
|
||||
/// A list of screen state definitions
|
||||
static var allCases: [MockTimelineVoiceBroadcastScreenState] {
|
||||
static var allCases: [MockVoiceBroadcastPlaybackScreenState] {
|
||||
[.animated]
|
||||
}
|
||||
|
||||
/// Generate the view struct for the screen state.
|
||||
var screenView: ([Any], AnyView) {
|
||||
let voiceBroadcast = TimelineVoiceBroadcastDetails(type: TimelineVoiceBroadcastType.player, chunks: [])
|
||||
let voiceBroadcast = VoiceBroadcastPlaybackDetails(type: VoiceBroadcastPlaybackType.player, chunks: [])
|
||||
|
||||
let viewModel = TimelineVoiceBroadcastViewModel(timelineVoiceBroadcastDetails: voiceBroadcast)
|
||||
let viewModel = VoiceBroadcastPlaybackViewModel(VoiceBroadcastPlaybackDetails: voiceBroadcast)
|
||||
|
||||
return (
|
||||
[false, viewModel],
|
||||
AnyView(TimelineVoiceBroadcastView(viewModel: viewModel.context))
|
||||
AnyView(VoiceBroadcastPlaybackView(viewModel: viewModel.context))
|
||||
)
|
||||
}
|
||||
}
|
||||
+8
-8
@@ -17,9 +17,9 @@
|
||||
import Combine
|
||||
import SwiftUI
|
||||
|
||||
typealias TimelineVoiceBroadcastViewModelType = StateStoreViewModel<TimelineVoiceBroadcastViewState, TimelineVoiceBroadcastViewAction>
|
||||
typealias VoiceBroadcastPlaybackViewModelType = StateStoreViewModel<VoiceBroadcastPlaybackViewState, VoiceBroadcastPlaybackViewAction>
|
||||
|
||||
class TimelineVoiceBroadcastViewModel: TimelineVoiceBroadcastViewModelType, TimelineVoiceBroadcastViewModelProtocol {
|
||||
class VoiceBroadcastPlaybackViewModel: VoiceBroadcastPlaybackViewModelType, VoiceBroadcastPlaybackViewModelProtocol {
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
@@ -27,17 +27,17 @@ class TimelineVoiceBroadcastViewModel: TimelineVoiceBroadcastViewModelType, Time
|
||||
|
||||
// MARK: Public
|
||||
|
||||
var completion: ((TimelineVoiceBroadcastViewModelResult) -> Void)?
|
||||
var completion: ((VoiceBroadcastPlaybackViewModelResult) -> Void)?
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
init(timelineVoiceBroadcastDetails: TimelineVoiceBroadcastDetails) {
|
||||
super.init(initialViewState: TimelineVoiceBroadcastViewState(voiceBroadcast: timelineVoiceBroadcastDetails, bindings: TimelineVoiceBroadcastViewStateBindings()))
|
||||
init(VoiceBroadcastPlaybackDetails: VoiceBroadcastPlaybackDetails) {
|
||||
super.init(initialViewState: VoiceBroadcastPlaybackViewState(voiceBroadcast: VoiceBroadcastPlaybackDetails, bindings: VoiceBroadcastPlaybackViewStateBindings()))
|
||||
}
|
||||
|
||||
// MARK: - Public
|
||||
|
||||
override func process(viewAction: TimelineVoiceBroadcastViewAction) {
|
||||
override func process(viewAction: VoiceBroadcastPlaybackViewAction) {
|
||||
switch viewAction {
|
||||
case .play:
|
||||
play()
|
||||
@@ -57,9 +57,9 @@ class TimelineVoiceBroadcastViewModel: TimelineVoiceBroadcastViewModelType, Time
|
||||
completion?(.paused)
|
||||
}
|
||||
|
||||
// MARK: - TimelineVoiceBroadcastViewModelProtocol
|
||||
// MARK: - VoiceBroadcastPlaybackViewModelProtocol
|
||||
|
||||
func updateWithVoiceBroadcastDetails(_ voiceBroadcastDetails: TimelineVoiceBroadcastDetails) {
|
||||
func updateWithVoiceBroadcastDetails(_ voiceBroadcastDetails: VoiceBroadcastPlaybackDetails) {
|
||||
state.voiceBroadcast = voiceBroadcastDetails
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -16,9 +16,9 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
protocol TimelineVoiceBroadcastViewModelProtocol {
|
||||
var context: TimelineVoiceBroadcastViewModelType.Context { get }
|
||||
var completion: ((TimelineVoiceBroadcastViewModelResult) -> Void)? { get set }
|
||||
protocol VoiceBroadcastPlaybackViewModelProtocol {
|
||||
var context: VoiceBroadcastPlaybackViewModelType.Context { get }
|
||||
var completion: ((VoiceBroadcastPlaybackViewModelResult) -> Void)? { get set }
|
||||
|
||||
func updateWithVoiceBroadcastDetails(_ voiceBroadcastDetails: TimelineVoiceBroadcastDetails)
|
||||
func updateWithVoiceBroadcastDetails(_ voiceBroadcastDetails: VoiceBroadcastPlaybackDetails)
|
||||
}
|
||||
Reference in New Issue
Block a user