Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 21:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix channel view in tab navigation

Browse Source
This commit is contained in:
Arkadiusz Fal 2021-12-17 20:53:36 +01:00
parent f609ed1ed4
commit 4fab7c2c16
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Player/VideoPlayerView.swift
View File

@ -43,8 +43,8 @@ struct VideoPlayerView: View {
.onChange(of: geometry.size) { size in .onChange(of: geometry.size) { size in
self.playerSize = size self.playerSize = size
} }
.navigationBarHidden(true)
} }
.navigationBarHidden(true)
#endif #endif
} }

5
Shared/Views/ChannelPlaylistView.swift
View File

@ -16,6 +16,7 @@ struct ChannelPlaylistView: View {
#endif #endif
@EnvironmentObject<AccountsModel> private var accounts @EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<PlayerModel> private var player
var items: [ContentItem] { var items: [ContentItem] {
ContentItem.array(of: store.item?.videos ?? []) ContentItem.array(of: store.item?.videos ?? [])
@ -83,7 +84,9 @@ struct ChannelPlaylistView: View {
} }
} }
.navigationTitle(playlist.title) .navigationTitle(playlist.title)
#if os(iOS)
.navigationBarHidden(player.playerNavigationLinkActive)
#endif
#else #else
.background(Color.background(scheme: colorScheme)) .background(Color.background(scheme: colorScheme))
#endif #endif

4
Shared/Views/ChannelVideosView.swift
View File

@ -19,6 +19,7 @@ struct ChannelVideosView: View {
@EnvironmentObject<AccountsModel> private var accounts @EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<NavigationModel> private var navigation @EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<SubscriptionsModel> private var subscriptions @EnvironmentObject<SubscriptionsModel> private var subscriptions
@Namespace private var focusNamespace @Namespace private var focusNamespace
@ -120,6 +121,9 @@ struct ChannelVideosView: View {
resource.load() resource.load()
} }
} }
#if os(iOS)
.navigationBarHidden(player.playerNavigationLinkActive)
#endif
.navigationTitle(navigationTitle) .navigationTitle(navigationTitle)
return Group { return Group {