kavin/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-04-28 16:00:33 +05:30
Code Issues Projects Releases Wiki Activity

Fix #425

Browse Source
This commit is contained in:
Arkadiusz Fal 2023-04-22 21:39:27 +02:00
parent 83dfdd6c0e
commit ea997ffdb9
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shared/Subscriptions/ChannelsView.swift
View File

@ -7,6 +7,7 @@ struct ChannelsView: View {
@ObservedObject private var subscriptions = SubscribedChannelsModel.shared @ObservedObject private var subscriptions = SubscribedChannelsModel.shared
@ObservedObject private var accounts = AccountsModel.shared @ObservedObject private var accounts = AccountsModel.shared
@ObservedObject private var feedCount = UnwatchedFeedCountModel.shared @ObservedObject private var feedCount = UnwatchedFeedCountModel.shared
private var navigation = NavigationModel.shared
@Default(.showCacheStatus) private var showCacheStatus @Default(.showCacheStatus) private var showCacheStatus
@Default(.showUnwatchedFeedBadges) private var showUnwatchedFeedBadges @Default(.showUnwatchedFeedBadges) private var showUnwatchedFeedBadges
@ -15,8 +16,7 @@ struct ChannelsView: View {
List { List {
Section(header: header) { Section(header: header) {
ForEach(subscriptions.all) { channel in ForEach(subscriptions.all) { channel in
NavigationLink(destination: ChannelVideosView(channel: channel)) { let label = HStack {
HStack {
if let url = channel.thumbnailURLOrCached { if let url = channel.thumbnailURLOrCached {
ThumbnailView(url: url) ThumbnailView(url: url)
.frame(width: 35, height: 35) .frame(width: 35, height: 35)
@ -28,6 +28,19 @@ struct ChannelsView: View {
} }
.backport .backport
.badge(showUnwatchedFeedBadges ? feedCount.unwatchedByChannelText(channel) : nil) .badge(showUnwatchedFeedBadges ? feedCount.unwatchedByChannelText(channel) : nil)
Group {
#if os(tvOS)
Button {
navigation.openChannel(channel, navigationStyle: .tab)
} label: {
label
}
#else
NavigationLink(destination: ChannelVideosView(channel: channel)) {
label
}
#endif
} }
.contextMenu { .contextMenu {
if subscriptions.isSubscribing(channel.id) { if subscriptions.isSubscribing(channel.id) {