Comments (fixes #4)

Shared/Navigation/AppSidebarNavigation.swift

@@ -6,11 +6,19 @@ import SwiftUI
 
 struct AppSidebarNavigation: View {
     @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<CommentsModel> private var comments
+    @EnvironmentObject<InstancesModel> private var instances
+    @EnvironmentObject<NavigationModel> private var navigation
+    @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<PlaylistsModel> private var playlists
+    @EnvironmentObject<RecentsModel> private var recents
+    @EnvironmentObject<SearchModel> private var search
+    @EnvironmentObject<SubscriptionsModel> private var subscriptions
+    @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel
 
     @Default(.visibleSections) private var visibleSections
 
     #if os(iOS)
-        @EnvironmentObject<NavigationModel> private var navigation
         @State private var didApplyPrimaryViewWorkAround = false
     #endif
 
@@ -42,15 +50,50 @@ struct AppSidebarNavigation: View {
                 .frame(minWidth: sidebarMinWidth)
 
             VStack {
-                Image(systemName: "play.tv")
-                    .renderingMode(.original)
-                    .font(.system(size: 60))
-                    .foregroundColor(.accentColor)
+                PlayerControlsView {
+                    HStack(alignment: .center) {
+                        Spacer()
+                        Image(systemName: "play.tv")
+                            .renderingMode(.original)
+                            .font(.system(size: 60))
+                            .foregroundColor(.accentColor)
+                        Spacer()
+                    }
+                }
             }
         }
+        #if os(iOS)
+        .background(
+            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
+                videoPlayer
+                    .environment(\.navigationStyle, .sidebar)
+            }
+        )
+        #elseif os(macOS)
+        .background(
+            EmptyView().sheet(isPresented: $player.presentingPlayer) {
+                videoPlayer
+                    .frame(minWidth: 1000, minHeight: 750)
+                    .environment(\.navigationStyle, .sidebar)
+            }
+        )
+        #endif
         .environment(\.navigationStyle, .sidebar)
     }
 
+    private var videoPlayer: some View {
+        VideoPlayerView()
+            .environmentObject(accounts)
+            .environmentObject(comments)
+            .environmentObject(instances)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(playlists)
+            .environmentObject(recents)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+    }
+
     var toolbarContent: some ToolbarContent {
         Group {
             #if os(iOS)

Shared/Navigation/AppTabNavigation.swift

@@ -3,10 +3,15 @@ import SwiftUI
 
 struct AppTabNavigation: View {
     @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<CommentsModel> private var comments
+    @EnvironmentObject<InstancesModel> private var instances
     @EnvironmentObject<NavigationModel> private var navigation
     @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<PlaylistsModel> private var playlists
     @EnvironmentObject<RecentsModel> private var recents
     @EnvironmentObject<SearchModel> private var search
+    @EnvironmentObject<SubscriptionsModel> private var subscriptions
+    @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel
 
     @Default(.visibleSections) private var visibleSections
 
@@ -67,6 +72,12 @@ struct AppTabNavigation: View {
                 }
             }
         )
+        .background(
+            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
+                videoPlayer
+                    .environment(\.navigationStyle, .sidebar)
+            }
+        )
     }
 
     private var favoritesNavigationView: some View {
@@ -155,6 +166,19 @@ struct AppTabNavigation: View {
         }
     }
 
+    private var videoPlayer: some View {
+        VideoPlayerView()
+            .environmentObject(accounts)
+            .environmentObject(comments)
+            .environmentObject(instances)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(playlists)
+            .environmentObject(recents)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+    }
+
     var toolbarContent: some ToolbarContent {
         #if os(iOS)
             Group {

Shared/Navigation/ContentView.swift

@@ -8,6 +8,7 @@ import SwiftUI
 
 struct ContentView: View {
     @StateObject private var accounts = AccountsModel()
+    @StateObject private var comments = CommentsModel()
     @StateObject private var instances = InstancesModel()
     @StateObject private var navigation = NavigationModel()
     @StateObject private var player = PlayerModel()
@@ -40,6 +41,7 @@ struct ContentView: View {
         .onAppear(perform: configure)
 
         .environmentObject(accounts)
+        .environmentObject(comments)
         .environmentObject(instances)
         .environmentObject(navigation)
         .environmentObject(player)
@@ -58,20 +60,6 @@ struct ContentView: View {
                     .environmentObject(navigation)
             }
         )
-        #if os(iOS)
-        .background(
-            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
-                videoPlayer
-            }
-        )
-        #elseif os(macOS)
-        .background(
-            EmptyView().sheet(isPresented: $player.presentingPlayer) {
-                videoPlayer
-                    .frame(minWidth: 1000, minHeight: 750)
-            }
-        )
-        #endif
         #if !os(tvOS)
         .handlesExternalEvents(preferring: Set(["*"]), allowing: Set(["*"]))
         .onOpenURL(perform: handleOpenedURL)
@@ -98,17 +86,6 @@ struct ContentView: View {
         #endif
     }
 
-    private var videoPlayer: some View {
-        VideoPlayerView()
-            .environmentObject(accounts)
-            .environmentObject(instances)
-            .environmentObject(navigation)
-            .environmentObject(player)
-            .environmentObject(playlists)
-            .environmentObject(subscriptions)
-            .environmentObject(thumbnailsModel)
-    }
-
     func configure() {
         SiestaLog.Category.enabled = .common
         SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)
@@ -128,15 +105,20 @@ struct ContentView: View {
             navigation.presentingWelcomeScreen = true
         }
 
-        player.accounts = accounts
         playlists.accounts = accounts
         search.accounts = accounts
         subscriptions.accounts = accounts
 
+        comments.accounts = accounts
+        comments.player = player
+
         menu.accounts = accounts
         menu.navigation = navigation
         menu.player = player
 
+        player.accounts = accounts
+        player.comments = comments
+
         if !accounts.current.isNil {
             player.loadHistoryDetails()
         }