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

Fix channel links

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-12-14 18:10:50 +01:00
parent a156ef6a3f
commit 67e32f4da1
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Channels/ChannelAvatarView.swift
View File

@ -13,7 +13,7 @@ struct ChannelAvatarView: View {
ZStack(alignment: .bottomTrailing) {
Group {
Group {
if let url = channel?.thumbnailURL {
if let url = channel?.thumbnailURLOrCached {
ThumbnailView(url: url)
} else {
ZStack {

3
Shared/Channels/ChannelLinkView.swift
View File

@ -6,6 +6,7 @@ struct ChannelLinkView<ChannelLabel: View>: View {
let channelLabel: ChannelLabel
@Environment(\.inChannelView) private var inChannelView
@Environment(\.inNavigationView) private var inNavigationView
@Environment(\.navigationStyle) private var navigationStyle
init(
@ -25,7 +26,7 @@ struct ChannelLinkView<ChannelLabel: View>: View {
#if os(tvOS)
channelLabel
#else
if navigationStyle == .tab {
if navigationStyle == .tab, inNavigationView {
channelNavigationLink
} else {
channelButton

14
Shared/Navigation/AppSidebarRecents.swift
View File

@ -70,8 +70,18 @@ struct RecentNavigationLink<DestinationContent: View>: View {
destination
} label: {
HStack {
Label(recent.title, systemImage: labelSystemImage)
.lineLimit(1)
if recent.type == .channel,
let channel = recent.channel,
channel.thumbnailURLOrCached != nil
{
ChannelAvatarView(channel: channel, subscribedBadge: false)
.frame(width: 20, height: 20)
Text(channel.name)
} else {
Label(recent.title, systemImage: labelSystemImage)
.lineLimit(1)
}
Spacer()