Channels layout improvements, other UI fixes

tvOS/ChannelView.swift

@@ -1,36 +0,0 @@
-import Siesta
-import SwiftUI
-
-struct ChannelView: View {
-    @ObservedObject private var store = Store<[Video]>()
-
-    var id: String
-
-    var resource: Resource {
-        InvidiousAPI.shared.channelVideos(id)
-    }
-
-    init(id: String) {
-        self.id = id
-        resource.addObserver(store)
-    }
-
-    var body: some View {
-        HStack {
-            Spacer()
-
-            VStack {
-                Spacer()
-                VideosView(videos: store.collection)
-                    .onAppear {
-                        resource.loadIfNeeded()
-                    }
-                Spacer()
-            }
-
-            Spacer()
-        }
-        .edgesIgnoringSafeArea(.all)
-        .background(.ultraThickMaterial)
-    }
-}

tvOS/TVNavigationView.swift

@@ -38,21 +38,26 @@ struct TVNavigationView: View {
                 VideoDetailsView(video)
             }
         }
-        .fullScreenCover(isPresented: $navigationState.showingChannel, onDismiss: {
-            navigationState.showVideoDetailsIfNeeded()
-        }) {
-            if let channel = navigationState.channel {
-                ChannelView(id: channel.id)
-            }
-        }
         .fullScreenCover(isPresented: $navigationState.showingVideo) {
             if let video = navigationState.video {
                 VideoPlayerView(video)
                     .environmentObject(playbackState)
             }
         }
+        .fullScreenCover(isPresented: $navigationState.isChannelOpen, onDismiss: {
+            navigationState.closeChannel(presentedChannel)
+        }) {
+            if presentedChannel != nil {
+                ChannelVideosView(presentedChannel)
+                    .background(.thickMaterial)
+            }
+        }
         .onPlayPauseCommand { showingOptions.toggle() }
     }
+
+    fileprivate var presentedChannel: Channel! {
+        navigationState.openChannels.first
+    }
 }
 
 struct TVNavigationView_Previews: PreviewProvider {