From ec8b34cad30c8fef085db163359a1cae47c6badd Mon Sep 17 00:00:00 2001
From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com>
Date: Wed, 13 Mar 2024 08:29:26 +0900
Subject: [PATCH] organize

---
 .../Buttons/CameraToggleButton.swift          | 31 +++++++-------
 .../Buttons/DisconnectRoomButton.swift        | 11 +++--
 .../Buttons/MicrophoneToggleButton.swift      | 32 +++++++--------
 .../ForEach/ForEachParticipant.swift          | 28 +++++++------
 .../ForEach/ForEachTrack.swift                | 24 ++++++-----
 .../Layouts/ParticipantLayout.swift           | 40 +++++++++----------
 .../Scopes/ComponentsScope.swift              | 12 +++---
 .../LiveKitComponents/Scopes/RoomScope.swift  | 12 +++---
 .../LiveKitComponents/Support/HorVGrid.swift  | 18 ++++-----
 .../LiveKitComponents/Support/HorVStack.swift | 26 ++++++------
 .../LiveKitComponents/TrackReference.swift    |  2 +-
 .../Views/LocalCameraPreview.swift            | 10 ++---
 .../ConnectionQualityIndicatorView.swift      |  6 +--
 .../ParticipantInformationView.swift          | 16 ++++----
 .../Views/Participant/ParticipantView.swift   | 15 ++++---
 .../Views/Room/ControlsView.swift             | 14 ++++---
 .../Views/Room/LocalCameraVideoView.swift     |  9 ++---
 .../TrackPublication/VideoTrackView.swift     | 23 +++++++----
 18 files changed, 167 insertions(+), 162 deletions(-)

diff --git a/Sources/LiveKitComponents/Buttons/CameraToggleButton.swift b/Sources/LiveKitComponents/Buttons/CameraToggleButton.swift
index b5b6002..e220d42 100644
--- a/Sources/LiveKitComponents/Buttons/CameraToggleButton.swift
+++ b/Sources/LiveKitComponents/Buttons/CameraToggleButton.swift
@@ -19,34 +19,33 @@ import SwiftUI
 
 /// The Camera Toggle Button is a button that toggles the camera on and off.
 public struct CameraToggleButton<Label: View, PublishedLabel: View>: View {
-    @EnvironmentObject var room: Room
-    @State var isBusy = false
+    @EnvironmentObject private var _room: Room
+    @State private var _isBusy = false
+    private let _label: ComponentBuilder<Label>
+    private let _publishedLabel: ComponentBuilder<PublishedLabel>
 
-    let label: ComponentBuilder<Label>
-    let publishedLabel: ComponentBuilder<PublishedLabel>
-
-    public init(@ViewBuilder label: @escaping ComponentBuilder<Label>, @ViewBuilder published: @escaping ComponentBuilder<PublishedLabel>) {
-        self.label = label
-        publishedLabel = published
+    private var isCameraEnabled: Bool {
+        _room.localParticipant.isCameraEnabled()
     }
 
-    var isCameraEnabled: Bool {
-        room.localParticipant.isCameraEnabled()
+    public init(@ViewBuilder label: @escaping ComponentBuilder<Label>, @ViewBuilder published: @escaping ComponentBuilder<PublishedLabel>) {
+        _label = label
+        _publishedLabel = published
     }
 
     public var body: some View {
         Button {
             Task {
-                isBusy = true
-                defer { Task { @MainActor in isBusy = false } }
-                try await room.localParticipant.setCamera(enabled: !isCameraEnabled)
+                _isBusy = true
+                defer { Task { @MainActor in _isBusy = false } }
+                try await _room.localParticipant.setCamera(enabled: !isCameraEnabled)
             }
         } label: {
             if isCameraEnabled {
-                publishedLabel()
+                _publishedLabel()
             } else {
-                label()
+                _label()
             }
-        }.disabled(isBusy)
+        }.disabled(_isBusy)
     }
 }
diff --git a/Sources/LiveKitComponents/Buttons/DisconnectRoomButton.swift b/Sources/LiveKitComponents/Buttons/DisconnectRoomButton.swift
index 6f17b98..19375b6 100644
--- a/Sources/LiveKitComponents/Buttons/DisconnectRoomButton.swift
+++ b/Sources/LiveKitComponents/Buttons/DisconnectRoomButton.swift
@@ -18,21 +18,20 @@ import LiveKit
 import SwiftUI
 
 public struct DisconnectRoomButton<Label: View>: View {
-    @EnvironmentObject var room: Room
-
-    let label: ComponentBuilder<Label>
+    @EnvironmentObject private var _room: Room
+    private let _label: ComponentBuilder<Label>
 
     public init(@ViewBuilder label: @escaping ComponentBuilder<Label>) {
-        self.label = label
+        _label = label
     }
 
     public var body: some View {
         Button {
             Task {
-                await room.disconnect()
+                await _room.disconnect()
             }
         } label: {
-            label()
+            _label()
         }
     }
 }
diff --git a/Sources/LiveKitComponents/Buttons/MicrophoneToggleButton.swift b/Sources/LiveKitComponents/Buttons/MicrophoneToggleButton.swift
index 7c81853..b4d1707 100644
--- a/Sources/LiveKitComponents/Buttons/MicrophoneToggleButton.swift
+++ b/Sources/LiveKitComponents/Buttons/MicrophoneToggleButton.swift
@@ -18,35 +18,33 @@ import LiveKit
 import SwiftUI
 
 public struct MicrophoneToggleButton<Label: View, PublishedLabel: View>: View {
-    @EnvironmentObject var room: Room
+    @EnvironmentObject private var _room: Room
+    @State private var _isBusy = false
+    private let _label: ComponentBuilder<Label>
+    private let _publishedLabel: ComponentBuilder<PublishedLabel>
 
-    @State var isBusy = false
-
-    let label: ComponentBuilder<Label>
-    let publishedLabel: ComponentBuilder<PublishedLabel>
-
-    public init(@ViewBuilder label: @escaping ComponentBuilder<Label>, @ViewBuilder published: @escaping ComponentBuilder<PublishedLabel>) {
-        self.label = label
-        publishedLabel = published
+    private var isMicrophoneEnabled: Bool {
+        _room.localParticipant.isMicrophoneEnabled()
     }
 
-    var isMicrophoneEnabled: Bool {
-        room.localParticipant.isMicrophoneEnabled()
+    public init(@ViewBuilder label: @escaping ComponentBuilder<Label>, @ViewBuilder published: @escaping ComponentBuilder<PublishedLabel>) {
+        _label = label
+        _publishedLabel = published
     }
 
     public var body: some View {
         Button {
             Task {
-                isBusy = true
-                defer { Task { @MainActor in isBusy = false } }
-                try await room.localParticipant.setMicrophone(enabled: !isMicrophoneEnabled)
+                _isBusy = true
+                defer { Task { @MainActor in _isBusy = false } }
+                try await _room.localParticipant.setMicrophone(enabled: !isMicrophoneEnabled)
             }
         } label: {
             if isMicrophoneEnabled {
-                publishedLabel()
+                _publishedLabel()
             } else {
-                label()
+                _label()
             }
-        }.disabled(isBusy)
+        }.disabled(_isBusy)
     }
 }
diff --git a/Sources/LiveKitComponents/ForEach/ForEachParticipant.swift b/Sources/LiveKitComponents/ForEach/ForEachParticipant.swift
index 13ddfe0..796cf75 100644
--- a/Sources/LiveKitComponents/ForEach/ForEachParticipant.swift
+++ b/Sources/LiveKitComponents/ForEach/ForEachParticipant.swift
@@ -21,7 +21,7 @@ import SwiftUI
 ///
 /// > Note: References `Room` environment object.
 public struct ForEachParticipant<Content: View>: View {
-    @EnvironmentObject var room: Room
+    // MARK: - Public types
 
     public enum Filter {
         case all
@@ -31,26 +31,28 @@ public struct ForEachParticipant<Content: View>: View {
         case isPublishingAudio
     }
 
+    @EnvironmentObject private var _room: Room
+
     /// Whether to include the local participant in the enumeration
-    let includeLocalParticipant: Bool
-    let filterMode: Filter
-    let content: ParticipantComponentBuilder<Content>
+    private let _includeLocalParticipant: Bool
+    private let _filterMode: Filter
+    private let _content: ParticipantComponentBuilder<Content>
 
     public init(includeLocalParticipant: Bool = true,
                 filter: Filter = .all,
                 @ViewBuilder content: @escaping ParticipantComponentBuilder<Content>)
     {
-        self.includeLocalParticipant = includeLocalParticipant
-        filterMode = filter
-        self.content = content
+        _includeLocalParticipant = includeLocalParticipant
+        _filterMode = filter
+        _content = content
     }
 
-    private func sortedParticipants() -> [Participant] {
+    private func _sortedParticipants() -> [Participant] {
         // Include LocalParticipant or not
-        let participants: [Participant] = Array(room.allParticipants.values).filter { participant in
+        let participants: [Participant] = Array(_room.allParticipants.values).filter { participant in
             // Filter out LocalParticipant if not required
-            if !includeLocalParticipant, participant is LocalParticipant { return false }
-            if case .canPublishVideoOrAudio = filterMode, !participant.permissions.canPublish { return false }
+            if !_includeLocalParticipant, participant is LocalParticipant { return false }
+            if case .canPublishVideoOrAudio = _filterMode, !participant.permissions.canPublish { return false }
             return true
         }
 
@@ -62,8 +64,8 @@ public struct ForEachParticipant<Content: View>: View {
     }
 
     public var body: some View {
-        ForEach(sortedParticipants()) { participant in
-            content(participant)
+        ForEach(_sortedParticipants()) { participant in
+            _content(participant)
                 .environmentObject(participant)
         }
     }
diff --git a/Sources/LiveKitComponents/ForEach/ForEachTrack.swift b/Sources/LiveKitComponents/ForEach/ForEachTrack.swift
index 24e59f1..2101d38 100644
--- a/Sources/LiveKitComponents/ForEach/ForEachTrack.swift
+++ b/Sources/LiveKitComponents/ForEach/ForEachTrack.swift
@@ -24,27 +24,29 @@ import SwiftUI
 ///
 /// > Note: References `Participant` environment object.
 public struct ForEachTrack<Content: View>: View {
+    // MARK: - Public types
+
     public enum Filter {
         case all
         case video
         case audio
     }
 
-    @EnvironmentObject var participant: Participant
+    @EnvironmentObject private var _participant: Participant
 
-    let filter: Filter
-    let content: TrackReferenceComponentBuilder<Content>
+    private let _filter: Filter
+    private let _content: TrackReferenceComponentBuilder<Content>
 
     public init(filter: Filter = .video,
                 @ViewBuilder content: @escaping TrackReferenceComponentBuilder<Content>)
     {
-        self.filter = filter
-        self.content = content
+        _filter = filter
+        _content = content
     }
 
-    private func computedTrackPublications() -> [TrackPublication] {
-        let trackPublications = Array(participant.trackPublications.values)
-        switch filter {
+    private func _computedTrackPublications() -> [TrackPublication] {
+        let trackPublications = Array(_participant.trackPublications.values)
+        switch _filter {
         case .all: return trackPublications
         case .video: return trackPublications.filter { $0.kind == .video }
         case .audio: return trackPublications.filter { $0.kind == .audio }
@@ -52,10 +54,10 @@ public struct ForEachTrack<Content: View>: View {
     }
 
     public var body: some View {
-        ForEach(computedTrackPublications()) { trackPublication in
-            let trackReference = TrackReference(participant: participant,
+        ForEach(_computedTrackPublications()) { trackPublication in
+            let trackReference = TrackReference(participant: _participant,
                                                 publication: trackPublication)
-            content(trackReference)
+            _content(trackReference)
                 .environmentObject(trackReference)
         }
     }
diff --git a/Sources/LiveKitComponents/Layouts/ParticipantLayout.swift b/Sources/LiveKitComponents/Layouts/ParticipantLayout.swift
index db2e24e..2fd5ba8 100644
--- a/Sources/LiveKitComponents/Layouts/ParticipantLayout.swift
+++ b/Sources/LiveKitComponents/Layouts/ParticipantLayout.swift
@@ -16,30 +16,28 @@
 
 import SwiftUI
 
-struct ParticipantLayout<Data: RandomAccessCollection, Content: View>: View where Data.Element: Identifiable, Data.Index: Hashable {
-    @Environment(\.liveKitUIOptions) var ui: UIOptions
+public struct ParticipantLayout<Data: RandomAccessCollection, Content: View>: View where Data.Element: Identifiable, Data.Index: Hashable {
+    private let _data: Data
+    private let _spacing: CGFloat?
+    private let _viewBuilder: (Data.Element) -> Content
 
-    private let data: Data
-    private let spacing: CGFloat?
-    private let viewBuilder: (Data.Element) -> Content
-
-    private func data(at index: Int) -> Data.Element {
-        let dataIndex = data.index(data.startIndex, offsetBy: index)
-        return data[dataIndex]
+    private func _data(at index: Int) -> Data.Element {
+        let dataIndex = _data.index(_data.startIndex, offsetBy: index)
+        return _data[dataIndex]
     }
 
     public init(_ data: Data,
                 spacing: CGFloat? = nil,
                 content: @escaping (Data.Element) -> Content)
     {
-        self.data = data
-        viewBuilder = content
-        self.spacing = spacing
+        _data = data
+        _viewBuilder = content
+        _spacing = spacing
     }
 
-    private func computeColumn() -> (columns: [Int], rows: Int) {
-        let baseCount = Int(ceil(Double(data.count).squareRoot()))
-        let remainder = data.count % baseCount
+    private func _computeColumn() -> (columns: [Int], rows: Int) {
+        let baseCount = Int(ceil(Double(_data.count).squareRoot()))
+        let remainder = _data.count % baseCount
         let firstRowCount = remainder > 0 ? remainder : baseCount
         let rows = remainder > 0 ? baseCount : baseCount
 
@@ -49,16 +47,16 @@ struct ParticipantLayout<Data: RandomAccessCollection, Content: View>: View wher
         return (columns: columns, rows: rows)
     }
 
-    var body: some View {
-        if data.count > 0 {
+    public var body: some View {
+        if _data.count > 0 {
             GeometryReader { _ in
-                let computed = computeColumn()
-                VStack(spacing: spacing) {
+                let computed = _computeColumn()
+                VStack(spacing: _spacing) {
                     ForEach(0 ..< computed.rows, id: \.self) { row in
-                        HStack(spacing: spacing) {
+                        HStack(spacing: _spacing) {
                             ForEach(0 ..< computed.columns[row], id: \.self) { column in
                                 let index = computed.columns.prefix(row).reduce(0, +) + column
-                                if index < data.count {
+                                if index < _data.count {
                                     ZStack(alignment: .center) {
                                         Color.white
                                         Text("\(index)")
diff --git a/Sources/LiveKitComponents/Scopes/ComponentsScope.swift b/Sources/LiveKitComponents/Scopes/ComponentsScope.swift
index f4a94c4..8ee6301 100644
--- a/Sources/LiveKitComponents/Scopes/ComponentsScope.swift
+++ b/Sources/LiveKitComponents/Scopes/ComponentsScope.swift
@@ -30,18 +30,18 @@ public extension EnvironmentValues {
 }
 
 public struct ComponentsScope<Content: View>: View {
-    var content: () -> Content
-    let preference: UIOptions
+    private let _content: () -> Content
+    private let _options: UIOptions
 
     public init(uiOptions: UIOptions? = nil,
                 @ViewBuilder _ content: @escaping () -> Content)
     {
-        preference = uiOptions ?? UIOptions()
-        self.content = content
+        _options = uiOptions ?? UIOptions()
+        _content = content
     }
 
     public var body: some View {
-        content()
-            .environment(\.liveKitUIOptions, preference)
+        _content()
+            .environment(\.liveKitUIOptions, _options)
     }
 }
diff --git a/Sources/LiveKitComponents/Scopes/RoomScope.swift b/Sources/LiveKitComponents/Scopes/RoomScope.swift
index 377f48b..1e3d488 100644
--- a/Sources/LiveKitComponents/Scopes/RoomScope.swift
+++ b/Sources/LiveKitComponents/Scopes/RoomScope.swift
@@ -18,18 +18,18 @@ import LiveKit
 import SwiftUI
 
 public struct RoomScope<Content: View>: View {
-    var content: () -> Content
-    let room: Room
+    private let _content: () -> Content
+    private let _room: Room
 
     public init(room: Room? = nil,
                 @ViewBuilder _ content: @escaping () -> Content)
     {
-        self.room = room ?? Room()
-        self.content = content
+        _room = room ?? Room()
+        _content = content
     }
 
     public var body: some View {
-        content()
-            .environmentObject(room)
+        _content()
+            .environmentObject(_room)
     }
 }
diff --git a/Sources/LiveKitComponents/Support/HorVGrid.swift b/Sources/LiveKitComponents/Support/HorVGrid.swift
index f4cec3e..9db8a8f 100644
--- a/Sources/LiveKitComponents/Support/HorVGrid.swift
+++ b/Sources/LiveKitComponents/Support/HorVGrid.swift
@@ -17,25 +17,25 @@
 import SwiftUI
 
 public struct HorVGrid<Content: View>: View {
-    let axis: Axis
-    let spacing: CGFloat?
-    let content: () -> Content
+    private let _axis: Axis
+    private let _spacing: CGFloat?
+    private let _content: () -> Content
 
     public init(axis: Axis = .horizontal,
                 spacing: CGFloat? = nil,
                 @ViewBuilder content: @escaping () -> Content)
     {
-        self.axis = axis
-        self.spacing = spacing
-        self.content = content
+        _axis = axis
+        _spacing = spacing
+        _content = content
     }
 
     public var body: some View {
         Group {
-            if axis == .vertical {
-                LazyVGrid(columns: [GridItem(.flexible())], spacing: spacing, content: content)
+            if _axis == .vertical {
+                LazyVGrid(columns: [GridItem(.flexible())], spacing: _spacing, content: _content)
             } else {
-                LazyHGrid(rows: [GridItem(.flexible())], spacing: spacing, content: content)
+                LazyHGrid(rows: [GridItem(.flexible())], spacing: _spacing, content: _content)
             }
         }
     }
diff --git a/Sources/LiveKitComponents/Support/HorVStack.swift b/Sources/LiveKitComponents/Support/HorVStack.swift
index 6591eb2..e13b489 100644
--- a/Sources/LiveKitComponents/Support/HorVStack.swift
+++ b/Sources/LiveKitComponents/Support/HorVStack.swift
@@ -18,11 +18,11 @@ import LiveKit
 import SwiftUI
 
 public struct HorVStack<Content: View>: View {
-    let axis: Axis
-    let horizontalAlignment: HorizontalAlignment
-    let verticalAlignment: VerticalAlignment
-    let spacing: CGFloat?
-    let content: () -> Content
+    private let _axis: Axis
+    private let _horizontalAlignment: HorizontalAlignment
+    private let _verticalAlignment: VerticalAlignment
+    private let _spacing: CGFloat?
+    private let _content: () -> Content
 
     public init(axis: Axis = .horizontal,
                 horizontalAlignment: HorizontalAlignment = .center,
@@ -30,19 +30,19 @@ public struct HorVStack<Content: View>: View {
                 spacing: CGFloat? = nil,
                 @ViewBuilder content: @escaping () -> Content)
     {
-        self.axis = axis
-        self.horizontalAlignment = horizontalAlignment
-        self.verticalAlignment = verticalAlignment
-        self.spacing = spacing
-        self.content = content
+        _axis = axis
+        _horizontalAlignment = horizontalAlignment
+        _verticalAlignment = verticalAlignment
+        _spacing = spacing
+        _content = content
     }
 
     public var body: some View {
         Group {
-            if axis == .vertical {
-                VStack(alignment: horizontalAlignment, spacing: spacing, content: content)
+            if _axis == .vertical {
+                VStack(alignment: _horizontalAlignment, spacing: _spacing, content: _content)
             } else {
-                HStack(alignment: verticalAlignment, spacing: spacing, content: content)
+                HStack(alignment: _verticalAlignment, spacing: _spacing, content: _content)
             }
         }
     }
diff --git a/Sources/LiveKitComponents/TrackReference.swift b/Sources/LiveKitComponents/TrackReference.swift
index a27ad73..13f4c6f 100644
--- a/Sources/LiveKitComponents/TrackReference.swift
+++ b/Sources/LiveKitComponents/TrackReference.swift
@@ -17,7 +17,7 @@
 import LiveKit
 import SwiftUI
 
-open class TrackReference: ObservableObject {
+public class TrackReference: ObservableObject {
     public let participant: Participant
     public let publication: TrackPublication?
     public let name: String?
diff --git a/Sources/LiveKitComponents/Views/LocalCameraPreview.swift b/Sources/LiveKitComponents/Views/LocalCameraPreview.swift
index 7e04a42..5573478 100644
--- a/Sources/LiveKitComponents/Views/LocalCameraPreview.swift
+++ b/Sources/LiveKitComponents/Views/LocalCameraPreview.swift
@@ -20,10 +20,10 @@ import SwiftUI
 public struct LocalCameraPreview: View {
     @Environment(\.liveKitUIOptions) var ui: UIOptions
 
-    let localVideoTrack: LocalVideoTrack
+    private let _localVideoTrack: LocalVideoTrack
 
     public init(localVideoTrack: LocalVideoTrack? = nil) {
-        self.localVideoTrack = localVideoTrack ?? LocalVideoTrack.createCameraTrack()
+        _localVideoTrack = localVideoTrack ?? LocalVideoTrack.createCameraTrack()
     }
 
     public var body: some View {
@@ -32,16 +32,16 @@ public struct LocalCameraPreview: View {
             ZStack {
                 ui.videoDisabledView(geometry: geometry)
 
-                SwiftUIVideoView(localVideoTrack,
+                SwiftUIVideoView(_localVideoTrack,
                                  mirrorMode: .mirror)
                     .onAppear {
                         Task {
-                            try await localVideoTrack.start()
+                            try await _localVideoTrack.start()
                         }
                     }
                     .onDisappear {
                         Task {
-                            try await localVideoTrack.stop()
+                            try await _localVideoTrack.stop()
                         }
                     }
             }
diff --git a/Sources/LiveKitComponents/Views/Participant/ConnectionQualityIndicatorView.swift b/Sources/LiveKitComponents/Views/Participant/ConnectionQualityIndicatorView.swift
index 4bf2726..31a499d 100644
--- a/Sources/LiveKitComponents/Views/Participant/ConnectionQualityIndicatorView.swift
+++ b/Sources/LiveKitComponents/Views/Participant/ConnectionQualityIndicatorView.swift
@@ -18,10 +18,10 @@ import LiveKit
 import SwiftUI
 
 public struct ConnectionQualityIndicatorView: View {
-    @EnvironmentObject var participant: Participant
-    @Environment(\.liveKitUIOptions) var ui: UIOptions
+    @EnvironmentObject private var _participant: Participant
+    @Environment(\.liveKitUIOptions) private var _ui: UIOptions
 
     public var body: some View {
-        ui.connectionQualityIndicatorBuilder(connectionQuality: participant.connectionQuality)
+        _ui.connectionQualityIndicatorBuilder(connectionQuality: _participant.connectionQuality)
     }
 }
diff --git a/Sources/LiveKitComponents/Views/Participant/ParticipantInformationView.swift b/Sources/LiveKitComponents/Views/Participant/ParticipantInformationView.swift
index 5f8c779..04e945f 100644
--- a/Sources/LiveKitComponents/Views/Participant/ParticipantInformationView.swift
+++ b/Sources/LiveKitComponents/Views/Participant/ParticipantInformationView.swift
@@ -18,24 +18,24 @@ import LiveKit
 import SwiftUI
 
 public struct ParticipantInformationView: View {
-    @EnvironmentObject var participant: Participant
-    @Environment(\.liveKitUIOptions) var ui: UIOptions
+    @EnvironmentObject private var _participant: Participant
+    @Environment(\.liveKitUIOptions) private var _ui: UIOptions
 
     public var body: some View {
-        HStack(spacing: ui.paddingSmall) {
-            if let identity = participant.identity {
+        HStack(spacing: _ui.paddingSmall) {
+            if let identity = _participant.identity {
                 Text(String(describing: identity))
                     .fontWeight(.bold)
             }
 
-            if let audio = participant.firstAudioPublication {
+            if let audio = _participant.firstAudioPublication {
                 if audio.isSubscribed, !audio.isMuted {
-                    ui.micEnabledView()
+                    _ui.micEnabledView()
                 } else {
-                    ui.micDisabledView()
+                    _ui.micDisabledView()
                 }
             } else {
-                ui.micDisabledView()
+                _ui.micDisabledView()
             }
 
             ConnectionQualityIndicatorView()
diff --git a/Sources/LiveKitComponents/Views/Participant/ParticipantView.swift b/Sources/LiveKitComponents/Views/Participant/ParticipantView.swift
index a97fc9b..d6f0b0f 100644
--- a/Sources/LiveKitComponents/Views/Participant/ParticipantView.swift
+++ b/Sources/LiveKitComponents/Views/Participant/ParticipantView.swift
@@ -18,28 +18,27 @@ import LiveKit
 import SwiftUI
 
 public struct ParticipantView: View {
-    @EnvironmentObject var participant: Participant
-    @Environment(\.liveKitUIOptions) var ui: UIOptions
-
-    let showInformation: Bool
+    @EnvironmentObject private var _participant: Participant
+    @Environment(\.liveKitUIOptions) private var _ui: UIOptions
+    private let _showInformation: Bool
 
     public init(showInformation: Bool = true) {
-        self.showInformation = showInformation
+        _showInformation = showInformation
     }
 
     public var body: some View {
         GeometryReader { geometry in
             ZStack(alignment: .topLeading) {
-                let cameraReference = TrackReference(participant: participant, source: .camera)
+                let cameraReference = TrackReference(participant: _participant, source: .camera)
 
                 if cameraReference.isResolvable {
                     VideoTrackView()
                         .environmentObject(cameraReference)
                 } else {
-                    ui.videoDisabledView(geometry: geometry)
+                    _ui.videoDisabledView(geometry: geometry)
                 }
 
-                if showInformation {
+                if _showInformation {
                     ParticipantInformationView()
                         .padding(5)
                         .background(Color.black.opacity(0.5))
diff --git a/Sources/LiveKitComponents/Views/Room/ControlsView.swift b/Sources/LiveKitComponents/Views/Room/ControlsView.swift
index 6741535..a1baab7 100644
--- a/Sources/LiveKitComponents/Views/Room/ControlsView.swift
+++ b/Sources/LiveKitComponents/Views/Room/ControlsView.swift
@@ -17,23 +17,25 @@
 import SwiftUI
 
 public struct ControlsView: View {
-    @Environment(\.liveKitUIOptions) var ui: UIOptions
+    @Environment(\.liveKitUIOptions) private var _ui: UIOptions
+
+    public init() {}
 
     public var body: some View {
         CameraToggleButton {
-            ui.enableCameraView()
+            _ui.enableCameraView()
         } published: {
-            ui.disableCameraView()
+            _ui.disableCameraView()
         }
 
         MicrophoneToggleButton {
-            ui.enableMicView()
+            _ui.enableMicView()
         } published: {
-            ui.disableMicView()
+            _ui.disableMicView()
         }
 
         DisconnectRoomButton {
-            ui.disconnectView()
+            _ui.disconnectView()
         }
     }
 }
diff --git a/Sources/LiveKitComponents/Views/Room/LocalCameraVideoView.swift b/Sources/LiveKitComponents/Views/Room/LocalCameraVideoView.swift
index 7053efb..b389279 100644
--- a/Sources/LiveKitComponents/Views/Room/LocalCameraVideoView.swift
+++ b/Sources/LiveKitComponents/Views/Room/LocalCameraVideoView.swift
@@ -18,18 +18,17 @@ import LiveKit
 import SwiftUI
 
 public struct LocalCameraVideoView: View {
-    @EnvironmentObject var room: Room
-    @Environment(\.liveKitUIOptions) var ui: UIOptions
+    @EnvironmentObject private var _room: Room
+    @Environment(\.liveKitUIOptions) private var _ui: UIOptions
 
     public init() {}
 
     public var body: some View {
         GeometryReader { geometry in
-
             ZStack {
-                ui.videoDisabledView(geometry: geometry)
+                _ui.videoDisabledView(geometry: geometry)
 
-                if let track = room.localParticipant.firstCameraVideoTrack {
+                if let track = _room.localParticipant.firstCameraVideoTrack {
                     SwiftUIVideoView(track)
                 }
             }
diff --git a/Sources/LiveKitComponents/Views/TrackPublication/VideoTrackView.swift b/Sources/LiveKitComponents/Views/TrackPublication/VideoTrackView.swift
index 814e800..2423d2d 100644
--- a/Sources/LiveKitComponents/Views/TrackPublication/VideoTrackView.swift
+++ b/Sources/LiveKitComponents/Views/TrackPublication/VideoTrackView.swift
@@ -18,25 +18,32 @@ import LiveKit
 import SwiftUI
 
 public struct VideoTrackView: View {
-    @EnvironmentObject var trackReference: TrackReference
-    @Environment(\.liveKitUIOptions) var ui: UIOptions
+    @EnvironmentObject var _trackReference: TrackReference
+    @Environment(\.liveKitUIOptions) var _ui: UIOptions
 
-    var layoutMode: VideoView.LayoutMode = .fill
-    var mirrorMode: VideoView.MirrorMode = .auto
+    private var _layoutMode: VideoView.LayoutMode
+    private var _mirrorMode: VideoView.MirrorMode
+
+    public init(layoutMode: VideoView.LayoutMode = .fill,
+                mirrorMode: VideoView.MirrorMode = .auto)
+    {
+        _layoutMode = layoutMode
+        _mirrorMode = mirrorMode
+    }
 
     public var body: some View {
         GeometryReader { geometry in
             ZStack {
-                ui.videoDisabledView(geometry: geometry)
+                _ui.videoDisabledView(geometry: geometry)
 
-                if let trackPublication = trackReference.resolve(),
+                if let trackPublication = _trackReference.resolve(),
                    let track = trackPublication.track as? VideoTrack,
                    trackPublication.isSubscribed,
                    !trackPublication.isMuted
                 {
                     SwiftUIVideoView(track,
-                                     layoutMode: layoutMode,
-                                     mirrorMode: mirrorMode)
+                                     layoutMode: _layoutMode,
+                                     mirrorMode: _mirrorMode)
                 }
             }
         }