Remove wrappers

pblazej · pblazej · commit 9fa33d2a1dc1 · 2025-10-21T12:39:07.000+02:00
diff --git a/VoiceAgent/App/AppView.swift b/VoiceAgent/App/AppView.swift
@@ -2,8 +2,8 @@ import LiveKit
 import SwiftUI
 
 struct AppView: View {
-    @LiveKitSession private var session
-    @LiveKitLocalMedia private var localMedia
+    @EnvironmentObject private var session: Session
+    @EnvironmentObject private var localMedia: LocalMedia
 
     @State private var chat: Bool = false
     @FocusState private var keyboardFocus: Bool
diff --git a/VoiceAgent/Chat/ChatTextInputView.swift b/VoiceAgent/Chat/ChatTextInputView.swift
@@ -3,7 +3,7 @@ import SwiftUI
 
 /// A multiplatform view that shows the chat input text field and send button.
 struct ChatTextInputView: View {
-    @LiveKitSession private var session
+    @EnvironmentObject private var session: Session
 
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @FocusState.Binding var keyboardFocus: Bool
diff --git a/VoiceAgent/ControlBar/AudioDeviceSelector.swift b/VoiceAgent/ControlBar/AudioDeviceSelector.swift
@@ -4,7 +4,7 @@ import SwiftUI
 #if os(macOS)
 /// A platform-specific view that shows a list of available audio devices.
 struct AudioDeviceSelector: View {
-    @LiveKitLocalMedia private var localMedia
+    @EnvironmentObject private var localMedia: LocalMedia
 
     var body: some View {
         Menu {
diff --git a/VoiceAgent/ControlBar/ControlBar.swift b/VoiceAgent/ControlBar/ControlBar.swift
@@ -4,8 +4,8 @@ import LiveKitComponents
 /// Available controls depend on the agent features and the track availability.
 /// - SeeAlso: ``AgentFeatures``
 struct ControlBar: View {
-    @LiveKitSession private var session
-    @LiveKitLocalMedia private var localMedia
+    @EnvironmentObject private var session: Session
+    @EnvironmentObject private var localMedia: LocalMedia
 
     @Binding var chat: Bool
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
@@ -126,7 +126,7 @@ struct ControlBar: View {
             Spacer()
         }
         .frame(width: Constants.buttonWidth)
-        .disabled(!session.hasAgents)
+        .disabled(!session.hasAgent)
     }
 
     @ViewBuilder
@@ -146,7 +146,7 @@ struct ControlBar: View {
                 borderColor: .separator1
             )
         )
-        .disabled(!session.hasAgents)
+        .disabled(!session.hasAgent)
     }
 
     @ViewBuilder
@@ -166,7 +166,7 @@ struct ControlBar: View {
                 borderColor: .separator1
             )
         )
-        .disabled(!session.hasAgents)
+        .disabled(!session.hasAgent)
     }
 
     @ViewBuilder
diff --git a/VoiceAgent/ControlBar/VideoDeviceSelector.swift b/VoiceAgent/ControlBar/VideoDeviceSelector.swift
@@ -5,7 +5,7 @@ import SwiftUI
 #if os(macOS)
 /// A platform-specific view that shows a list of available video devices.
 struct VideoDeviceSelector: View {
-    @LiveKitLocalMedia private var localMedia
+    @EnvironmentObject private var localMedia: LocalMedia
 
     var body: some View {
         Menu {
diff --git a/VoiceAgent/Helpers/Environment.swift b/VoiceAgent/Helpers/Environment.swift
@@ -1,5 +1,7 @@
+import LiveKit
 import SwiftUI
 
 extension EnvironmentValues {
     @Entry var namespace: Namespace.ID? // don't initialize outside View
+    @Entry var agent: Agent?
 }
diff --git a/VoiceAgent/Interactions/TextInteractionView.swift b/VoiceAgent/Interactions/TextInteractionView.swift
@@ -10,8 +10,8 @@ import SwiftUI
 ///
 /// Additionally, the view shows a complete chat view with text input capabilities.
 struct TextInteractionView: View {
-    @LiveKitAgent private var agent
-    @LiveKitLocalMedia private var localMedia
+    @EnvironmentObject private var localMedia: LocalMedia
+    @Environment(\.agent) private var agent
 
     @FocusState.Binding var keyboardFocus: Bool
 
diff --git a/VoiceAgent/Participant/AgentParticipantView.swift b/VoiceAgent/Participant/AgentParticipantView.swift
@@ -4,9 +4,8 @@ import LiveKitComponents
 /// or the audio visualizer (if available).
 /// - Note: If both are unavailable, the view will show a placeholder visualizer.
 struct AgentParticipantView: View {
-    @LiveKitSession private var session
-    @LiveKitAgent private var agent
-
+    @EnvironmentObject private var session: Session
+    @Environment(\.agent) private var agent
     @Environment(\.namespace) private var namespace
     /// Reveals the avatar camera view when true.
     @SceneStorage("videoTransition") private var videoTransition = false
diff --git a/VoiceAgent/Participant/LocalParticipantView.swift b/VoiceAgent/Participant/LocalParticipantView.swift
@@ -2,7 +2,7 @@ import LiveKitComponents
 
 /// A view that shows the local participant's camera view with flip control.
 struct LocalParticipantView: View {
-    @LiveKitLocalMedia private var localMedia
+    @EnvironmentObject private var localMedia: LocalMedia
 
     @Environment(\.namespace) private var namespace
 
diff --git a/VoiceAgent/Participant/ScreenShareView.swift b/VoiceAgent/Participant/ScreenShareView.swift
@@ -2,7 +2,7 @@ import LiveKitComponents
 
 /// A view that shows the screen share preview.
 struct ScreenShareView: View {
-    @LiveKitLocalMedia private var localMedia
+    @EnvironmentObject private var localMedia: LocalMedia
 
     @Environment(\.namespace) private var namespace
 
diff --git a/VoiceAgent/Start/StartView.swift b/VoiceAgent/Start/StartView.swift
@@ -3,7 +3,7 @@ import SwiftUI
 
 /// The initial view that is shown when the app is not connected to the server.
 struct StartView: View {
-    @LiveKitSession private var session
+    @EnvironmentObject private var session: Session
 
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @Namespace private var button
diff --git a/VoiceAgent/VoiceAgentApp.swift b/VoiceAgent/VoiceAgentApp.swift
@@ -23,6 +23,7 @@ struct VoiceAgentApp: App {
         WindowGroup {
             AppView()
                 .environmentObject(session)
+                .environment(\.agent, session.agent)
                 .environmentObject(LocalMedia(session: session))
         }
         #if os(macOS)

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import LiveKitComponents`
`4`	`4`	`/// Available controls depend on the agent features and the track availability.`
`5`	`5`	/// - SeeAlso: ``AgentFeatures``
`6`	`6`	`struct ControlBar: View {`
`7`		`- @LiveKitSession private var session`
`8`		`- @LiveKitLocalMedia private var localMedia`
	`7`	`+ @EnvironmentObject private var session: Session`
	`8`	`+ @EnvironmentObject private var localMedia: LocalMedia`
`9`	`9`
`10`	`10`	`@Binding var chat: Bool`
`11`	`11`	`@Environment(\.horizontalSizeClass) private var horizontalSizeClass`
`@@ -126,7 +126,7 @@ struct ControlBar: View {`
`126`	`126`	`Spacer()`
`127`	`127`	`}`
`128`	`128`	`.frame(width: Constants.buttonWidth)`
`129`		`- .disabled(!session.hasAgents)`
	`129`	`+ .disabled(!session.hasAgent)`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@ViewBuilder`
`@@ -146,7 +146,7 @@ struct ControlBar: View {`
`146`	`146`	`borderColor: .separator1`
`147`	`147`	`)`
`148`	`148`	`)`
`149`		`- .disabled(!session.hasAgents)`
	`149`	`+ .disabled(!session.hasAgent)`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`@ViewBuilder`
`@@ -166,7 +166,7 @@ struct ControlBar: View {`
`166`	`166`	`borderColor: .separator1`
`167`	`167`	`)`
`168`	`168`	`)`
`169`		`- .disabled(!session.hasAgents)`
	`169`	`+ .disabled(!session.hasAgent)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`@ViewBuilder`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
	`1`	`+import LiveKit`
`1`	`2`	`import SwiftUI`
`2`	`3`
`3`	`4`	`extension EnvironmentValues {`
`4`	`5`	`@Entry var namespace: Namespace.ID? // don't initialize outside View`
	`6`	`+ @Entry var agent: Agent?`
`5`	`7`	`}`