New channel navigation

Model/NavigationModel.swift

@@ -78,6 +78,8 @@ final class NavigationModel: ObservableObject {
             return
         }
 
+        navigation.presentingChannel = false
+
         let recent = RecentItem(from: channel)
         #if os(macOS)
             Windows.main.open()

Model/Player/PlayerModel.swift

@@ -549,4 +549,8 @@ final class PlayerModel: ObservableObject {
             }
         #endif
     }
+
+    func setNeedsDrawing(_ needsDrawing: Bool) {
+        backends.forEach { $0.setNeedsDrawing(needsDrawing) }
+    }
 }

Model/RecentsModel.swift

@@ -4,6 +4,7 @@ import Foundation
 final class RecentsModel: ObservableObject {
     @Default(.recentlyOpened) var items
     @Default(.saveRecents) var saveRecents
+
     func clear() {
         items = []
     }

Shared/Navigation/AppTabNavigation.swift

@@ -44,22 +44,8 @@ struct AppTabNavigation: View {
         }
         .id(accounts.current?.id ?? "")
         .environment(\.navigationStyle, .tab)
-        .background(
+        .overlay(channelView)
-            EmptyView().sheet(isPresented: $navigation.presentingChannel) {
+
-                if let channel = recents.presentedChannel {
-                    NavigationView {
-                        ChannelVideosView(channel: channel)
-                            .environment(\.managedObjectContext, persistenceController.container.viewContext)
-                            .environment(\.inChannelView, true)
-                            .environmentObject(accounts)
-                            .environmentObject(navigation)
-                            .environmentObject(player)
-                            .environmentObject(subscriptions)
-                            .environmentObject(thumbnailsModel)
-                    }
-                }
-            }
-        )
         .background(
             EmptyView().sheet(isPresented: $navigation.presentingPlaylist) {
                 if let playlist = recents.presentedPlaylist {
@@ -188,4 +174,16 @@ struct AppTabNavigation: View {
             }
         #endif
     }
+
+    private var channelView: some View {
+        ChannelVideosView()
+            .environment(\.managedObjectContext, persistenceController.container.viewContext)
+            .environment(\.inChannelView, true)
+            .environment(\.navigationStyle, .tab)
+            .environmentObject(accounts)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+    }
 }

Shared/Navigation/ContentView.swift

@@ -26,6 +26,8 @@ struct ContentView: View {
         @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     #endif
 
+    let persistenceController = PersistenceController.shared
+
     var body: some View {
         Group {
             #if os(iOS)

Shared/Player/AppleAVPlayerViewController.swift

@@ -179,6 +179,7 @@ extension AppleAVPlayerViewController: AVPlayerViewControllerDelegate {
     ) {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             self.playerModel.show()
+            self.playerModel.setNeedsDrawing(true)
 
             #if os(tvOS)
                 if self.playerModel.playingInPictureInPicture {

Shared/Videos/VideoCell.swift

@@ -7,6 +7,7 @@ struct VideoCell: View {
     private var video: Video
 
     @Environment(\.navigationStyle) private var navigationStyle
+    @Environment(\.inChannelView) private var inChannelView
 
     #if os(iOS)
         @Environment(\.verticalSizeClass) private var verticalSizeClass
@@ -294,6 +295,10 @@ struct VideoCell: View {
 
     private func channelButton(badge: Bool = true) -> some View {
         Button {
+            guard !inChannelView else {
+                return
+            }
+
             NavigationModel.openChannel(
                 video.channel,
                 player: player,

Shared/Views/ChannelVideosView.swift

@@ -2,15 +2,23 @@ import Siesta
 import SwiftUI
 
 struct ChannelVideosView: View {
-    let channel: Channel
+    #if os(iOS)
+        static let hiddenOffset = max(UIScreen.main.bounds.height, UIScreen.main.bounds.width) + 100
+    #endif
+    var channel: Channel?
 
     @State private var presentingShareSheet = false
     @State private var shareURL: URL?
     @State private var subscriptionToggleButtonDisabled = false
 
+    #if os(iOS)
+        @State private var viewVerticalOffset = Self.hiddenOffset
+    #endif
+
     @StateObject private var store = Store<Channel>()
 
     @Environment(\.colorScheme) private var colorScheme
+    @Environment(\.navigationStyle) private var navigationStyle
 
     #if os(iOS)
         @Environment(\.horizontalSizeClass) private var horizontalSizeClass
@@ -19,17 +27,42 @@ struct ChannelVideosView: View {
 
     @EnvironmentObject<AccountsModel> private var accounts
     @EnvironmentObject<NavigationModel> private var navigation
+    @EnvironmentObject<RecentsModel> private var recents
     @EnvironmentObject<SubscriptionsModel> private var subscriptions
 
     @Namespace private var focusNamespace
 
+    var presentedChannel: Channel? {
+        recents.presentedChannel ?? channel
+    }
+
     var videos: [ContentItem] {
         ContentItem.array(of: store.item?.videos ?? [])
     }
 
     var body: some View {
-        BrowserPlayerControls {
+        if navigationStyle == .tab {
-            content
+            NavigationView {
+                BrowserPlayerControls {
+                    content
+                }
+            }
+            #if os(iOS)
+            .onChange(of: navigation.presentingChannel) { newValue in
+                if newValue {
+                    resource?.load()
+                    viewVerticalOffset = 0
+                } else {
+                    viewVerticalOffset = Self.hiddenOffset
+                }
+            }
+            .offset(y: viewVerticalOffset)
+            .animation(.easeIn(duration: 0.2), value: viewVerticalOffset)
+            #endif
+        } else {
+            BrowserPlayerControls {
+                content
+            }
         }
     }
 
@@ -43,8 +76,10 @@ struct ChannelVideosView: View {
 
                     Spacer()
 
-                    FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
+                    if let channel = presentedChannel {
-                        .labelStyle(.iconOnly)
+                        FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
+                            .labelStyle(.iconOnly)
+                    }
 
                     if let subscribers = store.item?.subscriptionsString {
                         Text("**\(subscribers)** subscribers")
@@ -66,11 +101,11 @@ struct ChannelVideosView: View {
         #if !os(tvOS)
         .toolbar {
             ToolbarItem(placement: .navigation) {
-                ShareButton(
+                if navigationStyle == .tab {
-                    contentItem: contentItem,
+                    Button("Done") {
-                    presentingShareSheet: $presentingShareSheet,
+                        navigation.presentingChannel = false
-                    shareURL: $shareURL
+                    }
-                )
+                }
             }
 
             ToolbarItem {
@@ -79,14 +114,22 @@ struct ChannelVideosView: View {
                         Text("\(store.item?.subscriptionsString ?? "loading")")
                             .fontWeight(.bold)
                         Text(" subscribers")
+                            .allowsTightening(true)
+                            .foregroundColor(.secondary)
+                            .opacity(store.item?.subscriptionsString != nil ? 1 : 0)
                     }
-                    .allowsTightening(true)
+
-                    .foregroundColor(.secondary)
+                    ShareButton(
-                    .opacity(store.item?.subscriptionsString != nil ? 1 : 0)
+                        contentItem: contentItem,
+                        presentingShareSheet: $presentingShareSheet,
+                        shareURL: $shareURL
+                    )
 
                     subscriptionToggleButton
 
-                    FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
+                    if let channel = presentedChannel {
+                        FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
+                    }
                 }
             }
         }
@@ -99,12 +142,11 @@ struct ChannelVideosView: View {
         }
         #endif
         .onAppear {
-            if store.item.isNil {
+            resource?.loadIfNeeded()
-                resource.addObserver(store)
-                resource.load()
-            }
         }
+        #if !os(tvOS)
         .navigationTitle(navigationTitle)
+        #endif
 
         return Group {
             if #available(macOS 12.0, *) {
@@ -121,44 +163,50 @@ struct ChannelVideosView: View {
         }
     }
 
-    private var resource: Resource {
+    private var resource: Resource? {
+        guard let channel = presentedChannel else {
+            return nil
+        }
+
         let resource = accounts.api.channel(channel.id)
         resource.addObserver(store)
 
         return resource
     }
 
-    private var subscriptionToggleButton: some View {
+    @ViewBuilder private var subscriptionToggleButton: some View {
-        Group {
+        if let channel = presentedChannel {
-            if accounts.app.supportsSubscriptions && accounts.signedIn {
+            Group {
-                if subscriptions.isSubscribing(channel.id) {
+                if accounts.app.supportsSubscriptions && accounts.signedIn {
-                    Button("Unsubscribe") {
+                    if subscriptions.isSubscribing(channel.id) {
-                        subscriptionToggleButtonDisabled = true
+                        Button("Unsubscribe") {
+                            subscriptionToggleButtonDisabled = true
 
-                        subscriptions.unsubscribe(channel.id) {
+                            subscriptions.unsubscribe(channel.id) {
-                            subscriptionToggleButtonDisabled = false
+                                subscriptionToggleButtonDisabled = false
+                            }
                         }
-                    }
+                    } else {
-                } else {
+                        Button("Subscribe") {
-                    Button("Subscribe") {
+                            subscriptionToggleButtonDisabled = true
-                        subscriptionToggleButtonDisabled = true
 
-                        subscriptions.subscribe(channel.id) {
+                            subscriptions.subscribe(channel.id) {
-                            subscriptionToggleButtonDisabled = false
+                                subscriptionToggleButtonDisabled = false
-                            navigation.sidebarSectionChanged.toggle()
+                                navigation.sidebarSectionChanged.toggle()
+                            }
                         }
                     }
                 }
             }
+            .disabled(subscriptionToggleButtonDisabled)
         }
-        .disabled(subscriptionToggleButtonDisabled)
     }
 
     private var contentItem: ContentItem {
-        ContentItem(channel: channel)
+        ContentItem(channel: presentedChannel)
     }
 
     private var navigationTitle: String {
-        store.item?.name ?? channel.name
+        presentedChannel?.name ?? store.item?.name ?? "No channel"
     }
 }