Remove observable object

dolbyio-samples · Jul 24, 2024 · 3a55e35 · 3a55e35
1 parent c2b115f
commit 3a55e35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/interactive-player/Interactive Viewer/Views/SingleStream/SingleStreamView.swift b/interactive-player/Interactive Viewer/Views/SingleStream/SingleStreamView.swift
@@ -2,22 +2,22 @@
 //  SingleStreamView.swift
 //
 
-import SwiftUI
-import RTSCore
 import DolbyIOUIKit
 import MillicastSDK
+import RTSCore
+import SwiftUI
 
 struct SingleStreamView: View {
-
     private enum Animation {
         static let duration: CGFloat = 0.75
         static let blendDuration: CGFloat = 3.0
         static let offset: CGFloat = 200.0
     }
 
     private let isShowingDetailPresentation: Bool
-    private let onSelect: ((StreamSource) -> Void)
+    private let onSelect: (StreamSource) -> Void
     private let onClose: (() -> Void)?
+    private var viewModel: SingleStreamViewModel
 
     @State private var showingScreenControls = false
     @State private var isShowingSettingsScreen: Bool = false
@@ -26,7 +26,6 @@ struct SingleStreamView: View {
 
     @StateObject private var userInteractionViewModel: UserInteractionViewModel = .init()
 
-    @ObservedObject private var viewModel: SingleStreamViewModel
     @ObservedObject private var themeManager = ThemeManager.shared
 
     init(

diff --git a/interactive-player/Interactive Viewer/Views/SingleStream/SingleStreamViewModel.swift b/interactive-player/Interactive Viewer/Views/SingleStream/SingleStreamViewModel.swift
@@ -8,23 +8,23 @@ import os
 import RTSCore
 
 @MainActor
-final class SingleStreamViewModel: ObservableObject {
+final class SingleStreamViewModel {
     static let logger = Logger(
         subsystem: Bundle.main.bundleIdentifier!,
         category: String(describing: SingleStreamViewModel.self)
     )
-    
+
     let sources: [StreamSource]
     let selectedVideoSource: StreamSource
     let selectedAudioSource: StreamSource?
     let settingsMode: SettingsMode
     let subscriptionManager: SubscriptionManager
     let videoTracksManager: VideoTracksManager
-    
+
     lazy var statsInfoViewModel = StatsInfoViewModel(streamSource: selectedVideoSource,
                                                      videoTracksManager: videoTracksManager,
                                                      subscriptionManager: subscriptionManager)
-    
+
     init(
         sources: [StreamSource],
         selectedVideoSource: StreamSource,
@@ -40,7 +40,7 @@ final class SingleStreamViewModel: ObservableObject {
         self.subscriptionManager = subscriptionManager
         self.videoTracksManager = videoTracksManager
     }
-    
+
     func streamSource(for id: UUID) -> StreamSource? {
         sources.first { $0.id == id }
     }