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

Simplify channels view

Browse Source
This commit is contained in:
Arkadiusz Fal 2023-05-29 16:31:01 +02:00
parent c6cff4dee4
commit be2e4acedd
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shared/Channels/ChannelVideosView.swift
View File

@ -4,7 +4,7 @@ import Siesta
import SwiftUI
struct ChannelVideosView: View {
var channel: Channel?
var channel: Channel
var showCloseButton = false
var inNavigationView = true
@ -32,7 +32,7 @@ struct ChannelVideosView: View {
@Default(.expandChannelDescription) private var expandChannelDescription
var presentedChannel: Channel? {
store.item?.channel ?? channel ?? recents.presentedChannel
store.item?.channel ?? channel
}
var contentItems: [ContentItem] {
@ -165,10 +165,7 @@ struct ChannelVideosView: View {
.onAppear {
descriptionExpanded = expandChannelDescription
if let channel,
let cache = ChannelsCacheModel.shared.retrieve(channel.cacheKey),
store.item.isNil
{
if let cache = ChannelsCacheModel.shared.retrieve(channel.cacheKey), store.item.isNil {
store.replace(cache)
}

4
Shared/Navigation/AppTabNavigation.swift
View File

@ -176,9 +176,9 @@ struct AppTabNavigation: View {
}
@ViewBuilder private var channelView: some View {
if navigation.presentingChannel {
if navigation.presentingChannel, let channel = recents.presentedChannel {
NavigationView {
ChannelVideosView(showCloseButton: true)
ChannelVideosView(channel: channel, showCloseButton: true)
}
.environment(\.managedObjectContext, persistenceController.container.viewContext)
.environment(\.inChannelView, true)

2
Shared/Subscriptions/ChannelsView.swift
View File

@ -78,7 +78,7 @@ struct ChannelsView: View {
}
}
.background(
NavigationLink(destination: ChannelVideosView(channel: channelForLink), isActive: $channelLinkActive, label: EmptyView.init)
NavigationLink(destination: ChannelVideosView(channel: channelForLink ?? Video.fixture.channel), isActive: $channelLinkActive, label: EmptyView.init)
)
.onAppear {
subscriptions.load()