From 4fab7c2c1689e6bfdd34b49e1fc6153b6634ffd1 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Fri, 17 Dec 2021 20:53:36 +0100
Subject: [PATCH] Fix channel view in tab navigation

---
 Shared/Player/VideoPlayerView.swift    | 2 +-
 Shared/Views/ChannelPlaylistView.swift | 7 +++++--
 Shared/Views/ChannelVideosView.swift   | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Shared/Player/VideoPlayerView.swift b/Shared/Player/VideoPlayerView.swift
index ba6e9a27..85ce20fa 100644
--- a/Shared/Player/VideoPlayerView.swift
+++ b/Shared/Player/VideoPlayerView.swift
@@ -43,8 +43,8 @@ struct VideoPlayerView: View {
                 .onChange(of: geometry.size) { size in
                     self.playerSize = size
                 }
-                .navigationBarHidden(true)
             }
+            .navigationBarHidden(true)
         #endif
     }
 
diff --git a/Shared/Views/ChannelPlaylistView.swift b/Shared/Views/ChannelPlaylistView.swift
index f19c6ff0..ce611904 100644
--- a/Shared/Views/ChannelPlaylistView.swift
+++ b/Shared/Views/ChannelPlaylistView.swift
@@ -16,6 +16,7 @@ struct ChannelPlaylistView: View {
     #endif
 
     @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<PlayerModel> private var player
 
     var items: [ContentItem] {
         ContentItem.array(of: store.item?.videos ?? [])
@@ -83,9 +84,11 @@ struct ChannelPlaylistView: View {
             }
         }
         .navigationTitle(playlist.title)
-
+            #if os(iOS)
+                .navigationBarHidden(player.playerNavigationLinkActive)
+            #endif
         #else
-        .background(Color.background(scheme: colorScheme))
+                .background(Color.background(scheme: colorScheme))
         #endif
     }
 
diff --git a/Shared/Views/ChannelVideosView.swift b/Shared/Views/ChannelVideosView.swift
index 704063d4..9d58104f 100644
--- a/Shared/Views/ChannelVideosView.swift
+++ b/Shared/Views/ChannelVideosView.swift
@@ -19,6 +19,7 @@ struct ChannelVideosView: View {
 
     @EnvironmentObject<AccountsModel> private var accounts
     @EnvironmentObject<NavigationModel> private var navigation
+    @EnvironmentObject<PlayerModel> private var player
     @EnvironmentObject<SubscriptionsModel> private var subscriptions
 
     @Namespace private var focusNamespace
@@ -120,6 +121,9 @@ struct ChannelVideosView: View {
                 resource.load()
             }
         }
+        #if os(iOS)
+        .navigationBarHidden(player.playerNavigationLinkActive)
+        #endif
         .navigationTitle(navigationTitle)
 
         return Group {