Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-09-19 17:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Subscribed channels list in tab navigation

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-12-11 12:38:57 +01:00
parent 7ba743afbc
commit 5e0f13cace
28 changed files with 566 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Model/Cache/FeedCacheModel.swift
View File

@ -17,7 +17,7 @@ struct FeedCacheModel {
)
func storeFeed(account: Account, videos: [Video]) {
let date = dateFormatter.string(from: Date())
let date = iso8601DateFormatter.string(from: Date())
logger.info("caching feed \(account.feedCacheKey) -- \(date)")
let feedTimeObject: JSON = ["date": date]
let videosObject: JSON = ["videos": videos.map(\.json).map(\.object)]
@ -40,7 +40,7 @@ struct FeedCacheModel {
func getFeedTime(account: Account) -> Date? {
if let json = try? storage.object(forKey: feedTimeCacheKey(account.feedCacheKey)),
let string = json.dictionaryValue["date"]?.string,
let date = dateFormatter.date(from: string)
let date = iso8601DateFormatter.date(from: string)
{
return date
}
@ -52,11 +52,27 @@ struct FeedCacheModel {
try? storage.removeAll()
}
private var dateFormatter: ISO8601DateFormatter {
.init()
}
private func feedTimeCacheKey(_ feedCacheKey: String) -> String {
"\(feedCacheKey)-feedTime"
}
private var iso8601DateFormatter: ISO8601DateFormatter {
.init()
}
private var dateFormatter: DateFormatter {
let formatter = DateFormatter()
formatter.dateStyle = .short
formatter.timeStyle = .medium
return formatter
}
private var dateFormatterForTimeOnly: DateFormatter {
let formatter = DateFormatter()
formatter.dateStyle = .none
formatter.timeStyle = .medium
return formatter
}
}

6
Model/Channel.swift
View File

@ -113,14 +113,16 @@ struct Channel: Identifiable, Hashable {
var json: JSON {
[
"id": id,
"name": name
"name": name,
"thumbnailURL": thumbnailURL?.absoluteString ?? ""
]
}
static func from(_ json: JSON) -> Self {
.init(
id: json["id"].stringValue,
name: json["name"].stringValue
name: json["name"].stringValue,
thumbnailURL: json["thumbnailURL"].url
)
}
}

2
Model/NavigationModel.swift
View File

@ -221,7 +221,7 @@ final class NavigationModel: ObservableObject {
presentingPlaylistForm = true
}
func presentUnsubscribeAlert(_ channel: Channel, subscriptions: SubscriptionsModel) {
func presentUnsubscribeAlert(_ channel: Channel, subscriptions: SubsribedChannelsModel) {
channelToUnsubscribe = channel
alert = Alert(
title: Text(

96
Model/SubscriptionsModel.swift → Model/SubsribedChannelsModel.swift
View File

@ -5,19 +5,20 @@ import Siesta
import SwiftUI
import SwiftyJSON
final class SubscriptionsModel: ObservableObject {
static var shared = SubscriptionsModel()
final class SubsribedChannelsModel: ObservableObject {
static var shared = SubsribedChannelsModel()
let logger = Logger(label: "stream.yattee.cache.channels")
static let diskConfig = DiskConfig(name: "channels")
static let memoryConfig = MemoryConfig()
let storage = try! Storage<String, JSON>(
diskConfig: SubscriptionsModel.diskConfig,
memoryConfig: SubscriptionsModel.memoryConfig,
diskConfig: SubsribedChannelsModel.diskConfig,
memoryConfig: SubsribedChannelsModel.memoryConfig,
transformer: CacheModel.jsonTransformer
)
@Published var isLoading = false
@Published var channels = [Channel]()
var accounts: AccountsModel { .shared }
@ -46,37 +47,49 @@ final class SubscriptionsModel: ObservableObject {
}
func load(force: Bool = false, onSuccess: @escaping () -> Void = {}) {
guard accounts.app.supportsSubscriptions, accounts.signedIn, let account = accounts.current else {
guard accounts.app.supportsSubscriptions, !isLoading, accounts.signedIn, let account = accounts.current else {
channels = []
return
}
loadCachedChannels(account)
let request = force ? resource?.load() : resource?.loadIfNeeded()
DispatchQueue.main.async { [weak self] in
guard let self else { return }
let request = force ? self.resource?.load() : self.resource?.loadIfNeeded()
request?
.onSuccess { resource in
if let channels: [Channel] = resource.typedContent() {
self.channels = channels
self.storeChannels(account: account, channels: channels)
onSuccess()
if request != nil {
self.isLoading = true
}
request?
.onCompletion { [weak self] _ in
self?.isLoading = false
}
}
.onFailure { _ in
self.channels = []
}
.onSuccess { resource in
if let channels: [Channel] = resource.typedContent() {
self.channels = channels
self.storeChannels(account: account, channels: channels)
onSuccess()
}
}
.onFailure { _ in
self.channels = []
}
}
}
func loadCachedChannels(_ account: Account) {
let cache = getChannels(account: account)
if !cache.isEmpty {
channels = cache
DispatchQueue.main.async {
self.channels = cache
}
}
}
func storeChannels(account: Account, channels: [Channel]) {
let date = dateFormatter.string(from: Date())
let date = iso8601DateFormatter.string(from: Date())
logger.info("caching channels \(channelsDateCacheKey(account)) -- \(date)")
let dateObject: JSON = ["date": date]
@ -104,7 +117,7 @@ final class SubscriptionsModel: ObservableObject {
}
}
private var dateFormatter: ISO8601DateFormatter {
private var iso8601DateFormatter: ISO8601DateFormatter {
.init()
}
@ -115,4 +128,49 @@ final class SubscriptionsModel: ObservableObject {
private func channelsDateCacheKey(_ account: Account) -> String {
"channels-\(account.id)-date"
}
func getFeedTime(account: Account) -> Date? {
if let json = try? storage.object(forKey: channelsDateCacheKey(account)),
let string = json.dictionaryValue["date"]?.string,
let date = iso8601DateFormatter.date(from: string)
{
return date
}
return nil
}
var feedTime: Date? {
if let account = accounts.current {
return getFeedTime(account: account)
}
return nil
}
var formattedCacheTime: String {
if let feedTime {
let isSameDay = Calendar(identifier: .iso8601).isDate(feedTime, inSameDayAs: Date())
let formatter = isSameDay ? dateFormatterForTimeOnly : dateFormatter
return formatter.string(from: feedTime)
}
return ""
}
private var dateFormatter: DateFormatter {
let formatter = DateFormatter()
formatter.dateStyle = .short
formatter.timeStyle = .medium
return formatter
}
private var dateFormatterForTimeOnly: DateFormatter {
let formatter = DateFormatter()
formatter.dateStyle = .none
formatter.timeStyle = .medium
return formatter
}
}

2
Shared/Defaults.swift
View File

@ -201,6 +201,8 @@ extension Defaults.Keys {
static let mpvCacheSecs = Key<String>("mpvCacheSecs", default: "120")
static let mpvCachePauseWait = Key<String>("mpvCachePauseWait", default: "3")
static let mpvEnableLogging = Key<Bool>("mpvEnableLogging", default: false)
static let subscriptionsViewPage = Key<SubscriptionsView.Page>("subscriptionsViewPage", default: .feed)
}
enum ResolutionSetting: String, CaseIterable, Defaults.Serializable {

4
Shared/Modifiers/PlayerOverlayModifier.swift
View File

@ -4,6 +4,8 @@ import SwiftUI
struct PlayerOverlayModifier: ViewModifier {
func body(content: Content) -> some View {
content
.overlay(ControlsBar(fullScreen: .constant(false)), alignment: .bottom)
#if !os(tvOS)
.overlay(ControlsBar(fullScreen: .constant(false)), alignment: .bottom)
#endif
}
}

8
Shared/Navigation/AppSidebarSubscriptions.swift
View File

@ -3,7 +3,7 @@ import SwiftUI
struct AppSidebarSubscriptions: View {
@ObservedObject private var navigation = NavigationModel.shared
@ObservedObject private var subscriptions = SubscriptionsModel.shared
@ObservedObject private var subscriptions = SubsribedChannelsModel.shared
var body: some View {
Section(header: Text("Subscriptions")) {
@ -23,3 +23,9 @@ struct AppSidebarSubscriptions: View {
}
}
}
struct AppSidebarSubscriptions_Previews: PreviewProvider {
static var previews: some View {
AppSidebarSubscriptions()
}
}

30
Shared/Navigation/AppTabNavigation.swift
View File

@ -5,7 +5,7 @@ struct AppTabNavigation: View {
@ObservedObject private var accounts = AccountsModel.shared
@ObservedObject private var navigation = NavigationModel.shared
private var player = PlayerModel.shared
@ObservedObject private var subscriptions = SubscriptionsModel.shared
@ObservedObject private var subscriptions = SubsribedChannelsModel.shared
@Default(.showHome) private var showHome
@Default(.showDocuments) private var showDocuments
@ -170,23 +170,27 @@ struct AppTabNavigation: View {
@ViewBuilder private var channelView: some View {
if navigation.presentingChannel {
ChannelVideosView()
.environment(\.managedObjectContext, persistenceController.container.viewContext)
.environment(\.inChannelView, true)
.environment(\.navigationStyle, .tab)
.id("channelVideos")
.zIndex(player.presentingPlayer ? -1 : 2)
.transition(.move(edge: .bottom))
NavigationView {
ChannelVideosView(showCloseButton: true)
}
.environment(\.managedObjectContext, persistenceController.container.viewContext)
.environment(\.inChannelView, true)
.environment(\.navigationStyle, .tab)
.id("channelVideos")
.zIndex(player.presentingPlayer ? -1 : 2)
.transition(.move(edge: .bottom))
}
}
@ViewBuilder private var playlistView: some View {
if navigation.presentingPlaylist {
ChannelPlaylistView()
.environment(\.managedObjectContext, persistenceController.container.viewContext)
.id("channelPlaylist")
.zIndex(player.presentingPlayer ? -1 : 1)
.transition(.move(edge: .bottom))
NavigationView {
ChannelPlaylistView(showCloseButton: true)
}
.environment(\.managedObjectContext, persistenceController.container.viewContext)
.id("channelPlaylist")
.zIndex(player.presentingPlayer ? -1 : 1)
.transition(.move(edge: .bottom))
}
}
}

2
Shared/Navigation/ContentView.swift
View File

@ -12,7 +12,7 @@ struct ContentView: View {
@ObservedObject private var navigation = NavigationModel.shared
@ObservedObject private var player = PlayerModel.shared
private var playlists = PlaylistsModel.shared
private var subscriptions = SubscriptionsModel.shared
private var subscriptions = SubsribedChannelsModel.shared
#if os(iOS)
@Environment(\.horizontalSizeClass) private var horizontalSizeClass

2
Shared/Player/AppleAVPlayerViewController.swift
View File

@ -8,7 +8,7 @@ final class AppleAVPlayerViewController: UIViewController {
var navigationModel: NavigationModel { .shared }
var playerModel: PlayerModel { .shared }
var playlistsModel: PlaylistsModel { .shared }
var subscriptionsModel: SubscriptionsModel { .shared }
var subscriptionsModel: SubsribedChannelsModel { .shared }
var playerView = AVPlayerViewController()
let persistenceController = PersistenceController.shared

2
Shared/Player/Video Details/CommentView.swift
View File

@ -15,7 +15,7 @@ struct CommentView: View {
@Environment(\.navigationStyle) private var navigationStyle
@ObservedObject private var comments = CommentsModel.shared
var subscriptions = SubscriptionsModel.shared
var subscriptions = SubsribedChannelsModel.shared
var body: some View {
VStack(alignment: .leading) {

2
Shared/Player/Video Details/VideoActions.swift
View File

@ -4,7 +4,7 @@ import SwiftUI
struct VideoActions: View {
@ObservedObject private var accounts = AccountsModel.shared
var navigation = NavigationModel.shared
@ObservedObject private var subscriptions = SubscriptionsModel.shared
@ObservedObject private var subscriptions = SubsribedChannelsModel.shared
@ObservedObject private var player = PlayerModel.shared
var video: Video?

109
Shared/Subscriptions/ChannelsView.swift Normal file
View File

@ -0,0 +1,109 @@
import SDWebImageSwiftUI
import SwiftUI
struct ChannelsView: View {
@ObservedObject private var subscriptions = SubsribedChannelsModel.shared
@ObservedObject private var accounts = AccountsModel.shared
var body: some View {
List {
Section(header: header) {
ForEach(subscriptions.all) { channel in
NavigationLink(destination: ChannelVideosView(channel: channel).modifier(PlayerOverlayModifier())) {
HStack {
if let url = channel.thumbnailURL {
ThumbnailView(url: url)
.frame(width: 35, height: 35)
.clipShape(RoundedRectangle(cornerRadius: 35))
Text(channel.name)
} else {
Label(channel.name, systemImage: RecentsModel.symbolSystemImage(channel.name))
}
}
}
}
#if os(tvOS)
.padding(.horizontal, 50)
#endif
Color.clear.padding(.bottom, 50)
.listRowBackground(Color.clear)
.backport
.listRowSeparator(false)
}
}
.onAppear {
subscriptions.load()
}
.onChange(of: accounts.current) { _ in
subscriptions.load(force: true)
}
#if os(iOS)
.refreshControl { refreshControl in
subscriptions.load(force: true) {
refreshControl.endRefreshing()
}
}
.backport
.refreshable {
await subscriptions.load(force: true)
}
#endif
#if !os(tvOS)
.background(
Button("Refresh") {
subscriptions.load(force: true)
}
.keyboardShortcut("r")
.opacity(0)
)
#endif
#if !os(macOS)
.onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in
subscriptions.load()
}
#endif
#if os(tvOS)
.padding(.horizontal, 30)
#endif
}
var header: some View {
HStack {
#if os(tvOS)
SubscriptionsPageButton()
#endif
Spacer()
CacheStatusHeader(
refreshTime: subscriptions.formattedCacheTime,
isLoading: subscriptions.isLoading
)
#if os(tvOS)
Button {
subscriptions.load(force: true)
} label: {
Label("Refresh", systemImage: "arrow.clockwise")
.labelStyle(.iconOnly)
.imageScale(.small)
.font(.caption2)
}
#endif
}
#if os(tvOS)
.padding(.bottom, 15)
.padding(.top, 15)
#endif
}
}
struct ChannelsView_Previews: PreviewProvider {
static var previews: some View {
NavigationView {
ChannelsView()
}
}
}

7
Shared/Subscriptions/SubscriptionsViewModel.swift → Shared/Subscriptions/FeedModel.swift
View File

@ -1,8 +1,8 @@
import Foundation
import Siesta
final class SubscriptionsViewModel: ObservableObject {
static let shared = SubscriptionsViewModel()
final class FeedModel: ObservableObject {
static let shared = FeedModel()
@Published var isLoading = false
@Published var videos = [Video]()
@ -114,7 +114,8 @@ final class SubscriptionsViewModel: ObservableObject {
}
private func loadCachedFeed() {
let cache = FeedCacheModel.shared.retrieveFeed(account: accounts.current)
guard let account = accounts.current else { return }
let cache = FeedCacheModel.shared.retrieveFeed(account: account)
if !cache.isEmpty {
DispatchQueue.main.async { [weak self] in
self?.videos = cache

82
Shared/Subscriptions/FeedView.swift Normal file
View File

@ -0,0 +1,82 @@
import Defaults
import Siesta
import SwiftUI
struct FeedView: View {
@ObservedObject private var feed = FeedModel.shared
@ObservedObject private var accounts = AccountsModel.shared
var videos: [ContentItem] {
ContentItem.array(of: feed.videos)
}
var body: some View {
VerticalCells(items: videos) {
HStack {
#if os(tvOS)
SubscriptionsPageButton()
#endif
Spacer()
CacheStatusHeader(refreshTime: feed.formattedFeedTime, isLoading: feed.isLoading)
#if os(tvOS)
Button {
feed.loadResources(force: true)
} label: {
Label("Refresh", systemImage: "arrow.clockwise")
.labelStyle(.iconOnly)
.imageScale(.small)
.font(.caption2)
}
#endif
}
.padding(.leading, 30)
#if os(tvOS)
.padding(.bottom, 15)
#endif
}
.environment(\.loadMoreContentHandler) { feed.loadNextPage() }
.onAppear {
feed.loadResources()
}
.onChange(of: accounts.current) { _ in
feed.reset()
feed.loadResources(force: true)
}
#if os(iOS)
.refreshControl { refreshControl in
feed.loadResources(force: true) {
refreshControl.endRefreshing()
}
}
.backport
.refreshable {
await feed.loadResources(force: true)
}
#endif
#if !os(tvOS)
.background(
Button("Refresh") {
feed.loadResources(force: true)
}
.keyboardShortcut("r")
.opacity(0)
)
#endif
#if !os(macOS)
.onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in
feed.loadResources()
}
#endif
}
}
struct SubscriptonsView_Previews: PreviewProvider {
static var previews: some View {
NavigationView {
FeedView()
}
}
}

22
Shared/Subscriptions/SubscriptionsPageButton.swift Normal file
View File

@ -0,0 +1,22 @@
import Defaults
import SwiftUI
struct SubscriptionsPageButton: View {
@Default(.subscriptionsViewPage) private var subscriptionsViewPage
var body: some View {
Button {
subscriptionsViewPage = subscriptionsViewPage.next()
} label: {
Text(subscriptionsViewPage.rawValue.capitalized)
.frame(maxWidth: .infinity)
.font(.caption2)
}
}
}
struct SubscriptionsPageButton_Previews: PreviewProvider {
static var previews: some View {
SubscriptionsPageButton()
}
}

108
Shared/Subscriptions/SubscriptionsView.swift
View File

@ -1,78 +1,68 @@
import Siesta
import Defaults
import SwiftUI
struct SubscriptionsView: View {
@ObservedObject private var model = SubscriptionsViewModel.shared
@ObservedObject private var accounts = AccountsModel.shared
var videos: [ContentItem] {
ContentItem.array(of: model.videos)
enum Page: String, CaseIterable, Defaults.Serializable {
case feed
case channels
}
@Default(.subscriptionsViewPage) private var subscriptionsViewPage
var body: some View {
SignInRequiredView(title: "Subscriptions".localized()) {
VerticalCells(items: videos) {
HStack {
Spacer()
CacheStatusHeader(refreshTime: model.formattedFeedTime, isLoading: model.isLoading)
#if os(tvOS)
Button {
model.loadResources(force: true)
} label: {
Label("Refresh", systemImage: "arrow.clockwise")
.labelStyle(.iconOnly)
.imageScale(.small)
.font(.caption2)
}
.padding(.horizontal, 10)
#endif
}
switch subscriptionsViewPage {
case .feed:
FeedView()
case .channels:
ChannelsView()
#if os(tvOS)
.ignoresSafeArea(.all, edges: .horizontal)
#endif
}
.environment(\.loadMoreContentHandler) { model.loadNextPage() }
.onAppear {
model.loadResources()
}
.onChange(of: accounts.current) { _ in
model.reset()
model.loadResources(force: true)
}
#if os(iOS)
.refreshControl { refreshControl in
model.loadResources(force: true) {
refreshControl.endRefreshing()
}
}
.backport
.refreshable {
await model.loadResources(force: true)
}
#endif
}
#if !os(tvOS)
.background(
Button("Refresh") {
model.loadResources(force: true)
}
.keyboardShortcut("r")
.opacity(0)
)
#endif
#if os(iOS)
.navigationBarTitleDisplayMode(RefreshControl.navigationBarTitleDisplayMode)
#endif
#if !os(macOS)
.onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in
model.loadResources()
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .principal) {
subscriptionsMenu
}
}
#endif
}
#if os(iOS)
var subscriptionsMenu: some View {
Menu {
Picker("Page", selection: $subscriptionsViewPage) {
Label("Feed", systemImage: "film").tag(Page.feed)
Label("Channels", systemImage: "person.3.fill").tag(Page.channels)
}
} label: {
HStack(spacing: 12) {
Text(menuLabel)
.font(.headline)
.foregroundColor(.primary)
Image(systemName: "chevron.down.circle.fill")
.foregroundColor(.accentColor)
.imageScale(.small)
}
.transaction { t in t.animation = nil }
}
}
var menuLabel: String {
subscriptionsViewPage == .channels ? "Channels" : "Feed"
}
#endif
}
struct SubscriptonsView_Previews: PreviewProvider {
struct SubscriptionsView_Previews: PreviewProvider {
static var previews: some View {
SubscriptionsView()
NavigationView {
SubscriptionsView()
}
}
}

33
Shared/Videos/ThumbnailView.swift
View File

@ -14,24 +14,27 @@ struct ThumbnailView: View {
var body: some View {
Group {
if imageManager.image != nil {
#if os(macOS)
Image(nsImage: imageManager.image!)
.resizable()
#else
Image(uiImage: imageManager.image!)
.resizable()
#endif
Group {
#if os(macOS)
Image(nsImage: imageManager.image!)
.resizable()
#else
Image(uiImage: imageManager.image!)
.resizable()
#endif
}
} else {
Rectangle().fill(Color("PlaceholderColor"))
.onAppear {
self.imageManager.setOnFailure { _ in
guard let url else { return }
self.thumbnails.insertUnloadable(url)
}
self.imageManager.load(url: url)
}
.onDisappear { self.imageManager.cancel() }
}
}
.onAppear {
guard let url else { return }
self.imageManager.setOnFailure { _ in
self.thumbnails.insertUnloadable(url)
}
self.imageManager.load(url: url)
}
.onDisappear { self.imageManager.cancel() }
}
}

74
Shared/Videos/VideoCell.swift
View File

@ -164,7 +164,7 @@ struct VideoCell: View {
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
if !channelOnThumbnail, !inChannelView {
channelButton(badge: false)
channelControl(badge: false)
}
if additionalDetailsAvailable {
@ -251,7 +251,7 @@ struct VideoCell: View {
.frame(minHeight: 40, alignment: .top)
#endif
if !channelOnThumbnail, !inChannelView {
channelButton(badge: false)
channelControl(badge: false)
.padding(.top, 4)
.padding(.bottom, 6)
}
@ -305,33 +305,55 @@ struct VideoCell: View {
}
}
@ViewBuilder private func channelButton(badge: Bool = true) -> some View {
@ViewBuilder private func channelControl(badge: Bool = true) -> some View {
if !video.channel.name.isEmpty {
Button {
guard !inChannelView else {
return
}
NavigationModel.shared.openChannel(
video.channel,
navigationStyle: navigationStyle
)
} label: {
if badge {
DetailBadge(text: video.author, style: .prominent)
.foregroundColor(.primary)
} else {
Text(video.channel.name)
.fontWeight(.semibold)
.foregroundColor(.secondary)
}
}
#if os(tvOS)
.buttonStyle(.card)
channelButton(badge: badge)
#else
.buttonStyle(.plain)
if navigationStyle == .tab {
channelNavigationLink(badge: badge)
} else {
channelButton(badge: badge)
}
#endif
.help("\(video.channel.name) Channel")
}
}
@ViewBuilder private func channelNavigationLink(badge: Bool = true) -> some View {
NavigationLink(destination: ChannelVideosView(channel: video.channel)) {
channelLabel(badge: badge)
}
}
@ViewBuilder private func channelButton(badge: Bool = true) -> some View {
Button {
guard !inChannelView else {
return
}
NavigationModel.shared.openChannel(
video.channel,
navigationStyle: navigationStyle
)
} label: {
channelLabel(badge: badge)
}
#if os(tvOS)
.buttonStyle(.card)
#else
.buttonStyle(.plain)
#endif
.help("\(video.channel.name) Channel")
}
@ViewBuilder private func channelLabel(badge: Bool = true) -> some View {
if badge {
DetailBadge(text: video.author, style: .prominent)
.foregroundColor(.primary)
} else {
Text(video.channel.name)
.fontWeight(.semibold)
.foregroundColor(.secondary)
}
}
@ -371,7 +393,7 @@ struct VideoCell: View {
Spacer()
if channelOnThumbnail, !inChannelView {
channelButton()
channelControl()
}
}
#if os(tvOS)

2
Shared/Views/CacheStatusHeader.swift
View File

@ -12,7 +12,7 @@ struct CacheStatusHeader: View {
.opacity(isLoading ? 1 : 0)
Text(refreshTime)
}
.font(.caption)
.font(.caption.monospacedDigit())
.foregroundColor(.secondary)
}
}

30
Shared/Views/ChannelCell.swift
View File

@ -8,20 +8,42 @@ struct ChannelCell: View {
@Environment(\.navigationStyle) private var navigationStyle
var body: some View {
#if os(tvOS)
button
#else
if navigationStyle == .tab {
navigationLink
} else {
button
}
#endif
}
var navigationLink: some View {
NavigationLink(destination: ChannelVideosView(channel: channel).modifier(PlayerOverlayModifier())) {
labelContent
}
}
var button: some View {
Button {
NavigationModel.shared.openChannel(
channel,
navigationStyle: navigationStyle
)
} label: {
content
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
.contentShape(RoundedRectangle(cornerRadius: 12))
labelContent
}
.buttonStyle(.plain)
}
var content: some View {
var label: some View {
labelContent
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
.contentShape(RoundedRectangle(cornerRadius: 12))
}
var labelContent: some View {
VStack {
HStack(alignment: .top, spacing: 3) {
Image(systemName: "person.crop.rectangle")

22
Shared/Views/ChannelPlaylistCell.swift
View File

@ -9,14 +9,22 @@ struct ChannelPlaylistCell: View {
var navigation = NavigationModel.shared
var body: some View {
Button {
NavigationModel.shared.openChannelPlaylist(playlist, navigationStyle: navigationStyle)
} label: {
content
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
.contentShape(RoundedRectangle(cornerRadius: 12))
if navigationStyle == .tab {
NavigationLink(destination: ChannelPlaylistView(playlist: playlist)) { cell }
} else {
Button {
NavigationModel.shared.openChannelPlaylist(playlist, navigationStyle: navigationStyle)
} label: {
cell
}
.buttonStyle(.plain)
}
.buttonStyle(.plain)
}
var cell: some View {
content
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
.contentShape(RoundedRectangle(cornerRadius: 12))
}
var content: some View {

13
Shared/Views/ChannelPlaylistView.swift
View File

@ -3,6 +3,7 @@ import SwiftUI
struct ChannelPlaylistView: View {
var playlist: ChannelPlaylist?
var showCloseButton = false
@State private var presentingShareSheet = false
@State private var shareURL: URL?
@ -36,16 +37,6 @@ struct ChannelPlaylistView: View {
}
var body: some View {
if navigationStyle == .tab {
NavigationView {
content
}
} else {
content
}
}
var content: some View {
VStack(alignment: .leading) {
#if os(tvOS)
HStack {
@ -81,7 +72,7 @@ struct ChannelPlaylistView: View {
#else
.toolbar {
ToolbarItem(placement: .cancellationAction) {
if navigationStyle == .tab {
if showCloseButton {
Button {
NavigationModel.shared.presentingPlaylist = false
} label: {

24
Shared/Views/ChannelVideosView.swift
View File

@ -4,6 +4,7 @@ import SwiftUI
struct ChannelVideosView: View {
var channel: Channel?
var showCloseButton = false
@State private var presentingShareSheet = false
@State private var shareURL: URL?
@ -15,7 +16,6 @@ struct ChannelVideosView: View {
@StateObject private var store = Store<Channel>()
@Environment(\.colorScheme) private var colorScheme
@Environment(\.navigationStyle) private var navigationStyle
#if os(iOS)
@Environment(\.horizontalSizeClass) private var horizontalSizeClass
@ -24,7 +24,7 @@ struct ChannelVideosView: View {
@ObservedObject private var accounts = AccountsModel.shared
@ObservedObject private var navigation = NavigationModel.shared
@ObservedObject private var recents = RecentsModel.shared
@ObservedObject private var subscriptions = SubscriptionsModel.shared
@ObservedObject private var subscriptions = SubsribedChannelsModel.shared
@Namespace private var focusNamespace
var presentedChannel: Channel? {
@ -40,16 +40,6 @@ struct ChannelVideosView: View {
}
var body: some View {
if navigationStyle == .tab {
NavigationView {
content
}
} else {
content
}
}
var content: some View {
let content = VStack {
#if os(tvOS)
VStack {
@ -95,7 +85,7 @@ struct ChannelVideosView: View {
}
#endif
ToolbarItem(placement: .cancellationAction) {
if navigationStyle == .tab {
if showCloseButton {
Button {
withAnimation(Constants.overlayAnimation) {
navigation.presentingChannel = false
@ -141,13 +131,7 @@ struct ChannelVideosView: View {
}
#endif
.onAppear {
if navigationStyle == .tab {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
resource?.loadIfNeeded()
}
} else {
resource?.loadIfNeeded()
}
resource?.loadIfNeeded()
}
.onChange(of: contentType) { _ in
resource?.load()

2
Shared/Views/ControlsBar.swift
View File

@ -14,7 +14,7 @@ struct ControlsBar: View {
var navigation = NavigationModel.shared
@ObservedObject private var model = PlayerModel.shared
@ObservedObject private var playlists = PlaylistsModel.shared
@ObservedObject private var subscriptions = SubscriptionsModel.shared
@ObservedObject private var subscriptions = SubsribedChannelsModel.shared
@ObservedObject private var controls = PlayerControlsModel.shared

2
Shared/Views/VideoContextMenuView.swift
View File

@ -15,7 +15,7 @@ struct VideoContextMenuView: View {
@ObservedObject private var navigation = NavigationModel.shared
@ObservedObject private var player = PlayerModel.shared
@ObservedObject private var playlists = PlaylistsModel.shared
@ObservedObject private var subscriptions = SubscriptionsModel.shared
@ObservedObject private var subscriptions = SubsribedChannelsModel.shared
@FetchRequest private var watchRequest: FetchedResults<Watch>

2
Shared/YatteeApp.swift
View File

@ -40,7 +40,7 @@ struct YatteeApp: App {
@StateObject private var playlists = PlaylistsModel.shared
@StateObject private var recents = RecentsModel.shared
@StateObject private var settings = SettingsModel.shared
@StateObject private var subscriptions = SubscriptionsModel.shared
@StateObject private var subscriptions = SubsribedChannelsModel.shared
@StateObject private var thumbnails = ThumbnailsModel.shared
let persistenceController = PersistenceController.shared

72
Yattee.xcodeproj/project.pbxproj
View File

@ -203,6 +203,7 @@
37270F1E28E06E3E00856150 /* String+Localizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37270F1B28E06E3E00856150 /* String+Localizable.swift */; };
3727B74A27872A920021C15E /* VisualEffectBlur-iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3727B74927872A920021C15E /* VisualEffectBlur-iOS.swift */; };
3727B74B27872B880021C15E /* VisualEffectBlur-macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3727B74727872A500021C15E /* VisualEffectBlur-macOS.swift */; };
372820402945E4A8009A0E2D /* SubscriptionsPageButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3728203F2945E4A8009A0E2D /* SubscriptionsPageButton.swift */; };
3729037E2739E47400EA99F6 /* MenuCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3729037D2739E47400EA99F6 /* MenuCommands.swift */; };
3729037F2739E47400EA99F6 /* MenuCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3729037D2739E47400EA99F6 /* MenuCommands.swift */; };
372915E42687E33E00F5A35B /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = 372915E32687E33E00F5A35B /* Defaults */; };
@ -496,7 +497,7 @@
3774124C27387D2300423605 /* RecentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C194C626F6A9C8005D3B96 /* RecentsModel.swift */; };
3774124D27387D2300423605 /* PlaylistsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BA794226DBA973002A0235 /* PlaylistsModel.swift */; };
3774124E27387D2300423605 /* Playlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 376578882685471400D4EA09 /* Playlist.swift */; };
3774124F27387D2300423605 /* SubscriptionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */; };
3774124F27387D2300423605 /* SubsribedChannelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubsribedChannelsModel.swift */; };
3774125027387D2300423605 /* Video.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D4B19626717E1500C925CA /* Video.swift */; };
3774125127387D2300423605 /* NavigationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371F2F19269B43D300E4A7AB /* NavigationModel.swift */; };
3774125227387D2300423605 /* Thumbnail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373CFADA269663F1003CB2C6 /* Thumbnail.swift */; };
@ -606,6 +607,12 @@
378E9C38294552A700B2D696 /* ThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C37294552A700B2D696 /* ThumbnailView.swift */; };
378E9C39294552A700B2D696 /* ThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C37294552A700B2D696 /* ThumbnailView.swift */; };
378E9C3A294552A700B2D696 /* ThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C37294552A700B2D696 /* ThumbnailView.swift */; };
378E9C3C2945565500B2D696 /* SubscriptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C3B2945565500B2D696 /* SubscriptionsView.swift */; };
378E9C3D2945565500B2D696 /* SubscriptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C3B2945565500B2D696 /* SubscriptionsView.swift */; };
378E9C3E2945565500B2D696 /* SubscriptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C3B2945565500B2D696 /* SubscriptionsView.swift */; };
378E9C4029455A5800B2D696 /* ChannelsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C3F29455A5800B2D696 /* ChannelsView.swift */; };
378E9C4129455A5800B2D696 /* ChannelsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C3F29455A5800B2D696 /* ChannelsView.swift */; };
378E9C4229455A5800B2D696 /* ChannelsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378E9C3F29455A5800B2D696 /* ChannelsView.swift */; };
378FFBC428660172009E3FBE /* URLParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378FFBC328660172009E3FBE /* URLParser.swift */; };
378FFBC528660172009E3FBE /* URLParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378FFBC328660172009E3FBE /* URLParser.swift */; };
378FFBC628660172009E3FBE /* URLParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378FFBC328660172009E3FBE /* URLParser.swift */; };
@ -650,9 +657,9 @@
37AAF29026740715007FC770 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF28F26740715007FC770 /* Channel.swift */; };
37AAF29126740715007FC770 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF28F26740715007FC770 /* Channel.swift */; };
37AAF29226740715007FC770 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF28F26740715007FC770 /* Channel.swift */; };
37AAF2A026741C97007FC770 /* SubscriptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF29F26741C97007FC770 /* SubscriptionsView.swift */; };
37AAF2A126741C97007FC770 /* SubscriptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF29F26741C97007FC770 /* SubscriptionsView.swift */; };
37AAF2A226741C97007FC770 /* SubscriptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF29F26741C97007FC770 /* SubscriptionsView.swift */; };
37AAF2A026741C97007FC770 /* FeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF29F26741C97007FC770 /* FeedView.swift */; };
37AAF2A126741C97007FC770 /* FeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF29F26741C97007FC770 /* FeedView.swift */; };
37AAF2A226741C97007FC770 /* FeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF29F26741C97007FC770 /* FeedView.swift */; };
37B044B726F7AB9000E1419D /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B044B626F7AB9000E1419D /* SettingsView.swift */; };
37B044B826F7AB9000E1419D /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B044B626F7AB9000E1419D /* SettingsView.swift */; };
37B044B926F7AB9000E1419D /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B044B626F7AB9000E1419D /* SettingsView.swift */; };
@ -826,12 +833,12 @@
37E04C0F275940FB00172673 /* VerticalScrollingFix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */; };
37E084AC2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */; };
37E084AD2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */; };
37E64DD126D597EB00C71877 /* SubscriptionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */; };
37E64DD226D597EB00C71877 /* SubscriptionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */; };
37E64DD326D597EB00C71877 /* SubscriptionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */; };
37E6D79C2944AE1A00550C3D /* SubscriptionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79B2944AE1A00550C3D /* SubscriptionsViewModel.swift */; };
37E6D79D2944AE1A00550C3D /* SubscriptionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79B2944AE1A00550C3D /* SubscriptionsViewModel.swift */; };
37E6D79E2944AE1A00550C3D /* SubscriptionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79B2944AE1A00550C3D /* SubscriptionsViewModel.swift */; };
37E64DD126D597EB00C71877 /* SubsribedChannelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubsribedChannelsModel.swift */; };
37E64DD226D597EB00C71877 /* SubsribedChannelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubsribedChannelsModel.swift */; };
37E64DD326D597EB00C71877 /* SubsribedChannelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E64DD026D597EB00C71877 /* SubsribedChannelsModel.swift */; };
37E6D79C2944AE1A00550C3D /* FeedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79B2944AE1A00550C3D /* FeedModel.swift */; };
37E6D79D2944AE1A00550C3D /* FeedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79B2944AE1A00550C3D /* FeedModel.swift */; };
37E6D79E2944AE1A00550C3D /* FeedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79B2944AE1A00550C3D /* FeedModel.swift */; };
37E6D7A02944CD3800550C3D /* CacheStatusHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79F2944CD3800550C3D /* CacheStatusHeader.swift */; };
37E6D7A12944CD3800550C3D /* CacheStatusHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79F2944CD3800550C3D /* CacheStatusHeader.swift */; };
37E6D7A22944CD3800550C3D /* CacheStatusHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E6D79F2944CD3800550C3D /* CacheStatusHeader.swift */; };
@ -1111,6 +1118,7 @@
37270F1B28E06E3E00856150 /* String+Localizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Localizable.swift"; sourceTree = "<group>"; };
3727B74727872A500021C15E /* VisualEffectBlur-macOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VisualEffectBlur-macOS.swift"; sourceTree = "<group>"; };
3727B74927872A920021C15E /* VisualEffectBlur-iOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VisualEffectBlur-iOS.swift"; sourceTree = "<group>"; };
3728203F2945E4A8009A0E2D /* SubscriptionsPageButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsPageButton.swift; sourceTree = "<group>"; };
3729037D2739E47400EA99F6 /* MenuCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCommands.swift; sourceTree = "<group>"; };
372915E52687E3B900F5A35B /* Defaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Defaults.swift; sourceTree = "<group>"; };
372CFD14285F2E2A00B0B54B /* ControlsBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlsBar.swift; sourceTree = "<group>"; };
@ -1263,6 +1271,8 @@
378E50FA26FE8B9F00F49626 /* Instance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Instance.swift; sourceTree = "<group>"; };
378E50FE26FE8EEE00F49626 /* AccountsMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsMenuView.swift; sourceTree = "<group>"; };
378E9C37294552A700B2D696 /* ThumbnailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailView.swift; sourceTree = "<group>"; };
378E9C3B2945565500B2D696 /* SubscriptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsView.swift; sourceTree = "<group>"; };
378E9C3F29455A5800B2D696 /* ChannelsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelsView.swift; sourceTree = "<group>"; };
378FFBC328660172009E3FBE /* URLParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLParser.swift; sourceTree = "<group>"; };
378FFBC82866018A009E3FBE /* URLParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLParserTests.swift; sourceTree = "<group>"; };
3795593527B08538007FF8F4 /* StreamControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreamControl.swift; sourceTree = "<group>"; };
@ -1279,7 +1289,7 @@
37AAF27D26737323007FC770 /* PopularView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopularView.swift; sourceTree = "<group>"; };
37AAF27F26737550007FC770 /* SearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = "<group>"; };
37AAF28F26740715007FC770 /* Channel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Channel.swift; sourceTree = "<group>"; };
37AAF29F26741C97007FC770 /* SubscriptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsView.swift; sourceTree = "<group>"; };
37AAF29F26741C97007FC770 /* FeedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedView.swift; sourceTree = "<group>"; };
37B044B626F7AB9000E1419D /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
37B17D9F268A1F25006AEE9B /* VideoContextMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoContextMenuView.swift; sourceTree = "<group>"; };
37B263192735EAAB00FE0D40 /* FavoriteResourceObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoriteResourceObserver.swift; sourceTree = "<group>"; };
@ -1367,8 +1377,8 @@
37DD9DC22785D63A00539416 /* UIResponder+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIResponder+Extensions.swift"; sourceTree = "<group>"; };
37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerticalScrollingFix.swift; sourceTree = "<group>"; };
37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsNavigationLink.swift; sourceTree = "<group>"; };
37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsModel.swift; sourceTree = "<group>"; };
37E6D79B2944AE1A00550C3D /* SubscriptionsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsViewModel.swift; sourceTree = "<group>"; };
37E64DD026D597EB00C71877 /* SubsribedChannelsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubsribedChannelsModel.swift; sourceTree = "<group>"; };
37E6D79B2944AE1A00550C3D /* FeedModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedModel.swift; sourceTree = "<group>"; };
37E6D79F2944CD3800550C3D /* CacheStatusHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheStatusHeader.swift; sourceTree = "<group>"; };
37E70922271CD43000D34DDE /* WelcomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeScreen.swift; sourceTree = "<group>"; };
37E70926271CDDAE00D34DDE /* OpenSettingsButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenSettingsButton.swift; sourceTree = "<group>"; };
@ -2272,7 +2282,7 @@
37CEE4BC2677B670005A1EFE /* SingleAssetStream.swift */,
3797758A2689345500DD52A8 /* Store.swift */,
37CEE4C02677B697005A1EFE /* Stream.swift */,
37E64DD026D597EB00C71877 /* SubscriptionsModel.swift */,
37E64DD026D597EB00C71877 /* SubsribedChannelsModel.swift */,
373CFADA269663F1003CB2C6 /* Thumbnail.swift */,
37C0698127260B2100F7F6CB /* ThumbnailsModel.swift */,
3705B181267B4E4900704544 /* TrendingCategory.swift */,
@ -2325,8 +2335,11 @@
37E6D79A2944ADCB00550C3D /* Subscriptions */ = {
isa = PBXGroup;
children = (
37AAF29F26741C97007FC770 /* SubscriptionsView.swift */,
37E6D79B2944AE1A00550C3D /* SubscriptionsViewModel.swift */,
378E9C3F29455A5800B2D696 /* ChannelsView.swift */,
37E6D79B2944AE1A00550C3D /* FeedModel.swift */,
37AAF29F26741C97007FC770 /* FeedView.swift */,
3728203F2945E4A8009A0E2D /* SubscriptionsPageButton.swift */,
378E9C3B2945565500B2D696 /* SubscriptionsView.swift */,
);
path = Subscriptions;
sourceTree = "<group>";
@ -2911,7 +2924,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
37E6D79C2944AE1A00550C3D /* SubscriptionsViewModel.swift in Sources */,
37E6D79C2944AE1A00550C3D /* FeedModel.swift in Sources */,
374710052755291C00CE0F87 /* SearchTextField.swift in Sources */,
37494EA529200B14000DF176 /* DocumentsView.swift in Sources */,
374DE88028BB896C0062BBF2 /* PlayerDragGesture.swift in Sources */,
@ -3018,7 +3031,7 @@
375E45F827B1AC4700BA7902 /* PlayerControlsModel.swift in Sources */,
37EAD86F267B9ED100D9E01B /* Segment.swift in Sources */,
375168D62700FAFF008F96A6 /* Debounce.swift in Sources */,
37E64DD126D597EB00C71877 /* SubscriptionsModel.swift in Sources */,
37E64DD126D597EB00C71877 /* SubsribedChannelsModel.swift in Sources */,
37C89322294532220032AFD3 /* PlayerOverlayModifier.swift in Sources */,
376578892685471400D4EA09 /* Playlist.swift in Sources */,
37B4E803277D0A72004BF56A /* AppDelegate.swift in Sources */,
@ -3063,6 +3076,7 @@
37FB28412721B22200A57617 /* ContentItem.swift in Sources */,
374924EA2921666E0017D862 /* VideoDetailsTool.swift in Sources */,
379F141F289ECE7F00DE48B5 /* QualitySettings.swift in Sources */,
378E9C4029455A5800B2D696 /* ChannelsView.swift in Sources */,
37C3A24D272360470087A57A /* ChannelPlaylist+Fixtures.swift in Sources */,
37484C2D26FC844700287258 /* InstanceSettings.swift in Sources */,
37DD9DA32785BBC900539416 /* NoCommentsView.swift in Sources */,
@ -3085,6 +3099,7 @@
37B81AFC26D2C9C900675966 /* VideoDetailsPaddingModifier.swift in Sources */,
37C7A1D5267BFD9D0010EAD6 /* SponsorBlockSegment.swift in Sources */,
37BA794F26DC3E0E002A0235 /* Int+Format.swift in Sources */,
378E9C3C2945565500B2D696 /* SubscriptionsView.swift in Sources */,
37D6025928C17375009E8D98 /* PlaybackStatsView.swift in Sources */,
37F49BA326CAA59B00304AC0 /* Playlist+Fixtures.swift in Sources */,
374C053B2724614F009BDDBE /* PlayerTVMenu.swift in Sources */,
@ -3114,7 +3129,7 @@
376BE50B27349108009AD608 /* BrowsingSettings.swift in Sources */,
3763C989290C7A50004D3B5F /* OpenVideosView.swift in Sources */,
37F0F4EE286F734400C06C2E /* AdvancedSettings.swift in Sources */,
37AAF2A026741C97007FC770 /* SubscriptionsView.swift in Sources */,
37AAF2A026741C97007FC770 /* FeedView.swift in Sources */,
374924E3292141320017D862 /* InspectorView.swift in Sources */,
37EF5C222739D37B00B03725 /* MenuModel.swift in Sources */,
37599F30272B42810087F250 /* FavoriteItem.swift in Sources */,
@ -3234,6 +3249,7 @@
37484C1A26FC837400287258 /* PlayerSettings.swift in Sources */,
37BD07C32698AD4F003EBB87 /* ContentView.swift in Sources */,
37484C3226FCB8F900287258 /* AccountValidator.swift in Sources */,
378E9C4129455A5800B2D696 /* ChannelsView.swift in Sources */,
378AE944274EF00A006A4EE1 /* Color+Background.swift in Sources */,
37F49BA426CAA59B00304AC0 /* Playlist+Fixtures.swift in Sources */,
37EAD870267B9ED100D9E01B /* Segment.swift in Sources */,
@ -3277,6 +3293,7 @@
3751B4B327836902000B7DF4 /* SearchPage.swift in Sources */,
3782B9532755667600990149 /* String+Format.swift in Sources */,
37635FE5291EA6CF00C11E79 /* OpenVideosButton.swift in Sources */,
378E9C3D2945565500B2D696 /* SubscriptionsView.swift in Sources */,
3776ADD7287381240078EBC4 /* Captions.swift in Sources */,
37E70924271CD43000D34DDE /* WelcomeScreen.swift in Sources */,
37F5E8B7291BE9D0006C15F5 /* URLBookmarkModel.swift in Sources */,
@ -3313,7 +3330,7 @@
37B81AFD26D2C9C900675966 /* VideoDetailsPaddingModifier.swift in Sources */,
37C0697F2725C8D400F7F6CB /* CMTime+DefaultTimescale.swift in Sources */,
37A9965B26D6F8CA006E3224 /* HorizontalCells.swift in Sources */,
37E6D79D2944AE1A00550C3D /* SubscriptionsViewModel.swift in Sources */,
37E6D79D2944AE1A00550C3D /* FeedModel.swift in Sources */,
37732FF52703D32400F04329 /* Sidebar.swift in Sources */,
379775942689365600DD52A8 /* Array+Next.swift in Sources */,
377ABC49286E5887009C986F /* Sequence+Unique.swift in Sources */,
@ -3321,7 +3338,7 @@
3784B23E2728B85300B09468 /* ShareButton.swift in Sources */,
375F7411289DC35A00747050 /* PlayerBackendView.swift in Sources */,
37FEF11427EFD8580033912F /* PlaceholderCell.swift in Sources */,
37E64DD226D597EB00C71877 /* SubscriptionsModel.swift in Sources */,
37E64DD226D597EB00C71877 /* SubsribedChannelsModel.swift in Sources */,
37F0F4EF286F734400C06C2E /* AdvancedSettings.swift in Sources */,
37C7A1D6267BFD9D0010EAD6 /* SponsorBlockSegment.swift in Sources */,
37319F0627103F94004ECCD0 /* PlayerQueue.swift in Sources */,
@ -3337,7 +3354,7 @@
37130A5C277657090033018A /* Yattee.xcdatamodeld in Sources */,
37FD43E42704847C0073EE42 /* View+Fixtures.swift in Sources */,
37C069782725962F00F7F6CB /* ScreenSaverManager.swift in Sources */,
37AAF2A126741C97007FC770 /* SubscriptionsView.swift in Sources */,
37AAF2A126741C97007FC770 /* FeedView.swift in Sources */,
37F4AD2728613B81004D0F66 /* Color+Debug.swift in Sources */,
37732FF12703A26300F04329 /* AccountValidationStatus.swift in Sources */,
37BA794C26DC30EC002A0235 /* AppSidebarPlaylists.swift in Sources */,
@ -3451,7 +3468,7 @@
3774123327387CB000423605 /* Defaults.swift in Sources */,
3774124E27387D2300423605 /* Playlist.swift in Sources */,
3766AFD2273DA97D00686348 /* Int+FormatTests.swift in Sources */,
3774124F27387D2300423605 /* SubscriptionsModel.swift in Sources */,
3774124F27387D2300423605 /* SubsribedChannelsModel.swift in Sources */,
3774126127387D2D00423605 /* AccountsModel.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -3468,6 +3485,7 @@
37DD9DBC2785D60300539416 /* FramePreferenceKey.swift in Sources */,
375EC974289F2ABF00751258 /* MultiselectRow.swift in Sources */,
37EBD8C827AF26B300F1C24B /* AVPlayerBackend.swift in Sources */,
378E9C3E2945565500B2D696 /* SubscriptionsView.swift in Sources */,
37EFAC0A28C138CD00ED9B89 /* ControlsOverlayModel.swift in Sources */,
37CC3F52270D010D00608308 /* VideoBanner.swift in Sources */,
37F49BA526CAA59B00304AC0 /* Playlist+Fixtures.swift in Sources */,
@ -3545,12 +3563,13 @@
373CFADD269663F1003CB2C6 /* Thumbnail.swift in Sources */,
376B0562293FF45F0062AC78 /* PeerTubeAPI.swift in Sources */,
3738535629451DC800D2D0CB /* BookmarksCacheModel.swift in Sources */,
37E64DD326D597EB00C71877 /* SubscriptionsModel.swift in Sources */,
37E64DD326D597EB00C71877 /* SubsribedChannelsModel.swift in Sources */,
3752069B285E8DD300CA655F /* Chapter.swift in Sources */,
37B044B926F7AB9000E1419D /* SettingsView.swift in Sources */,
3743B86A27216D3600261544 /* ChannelCell.swift in Sources */,
3751BA8527E6914F007B1A60 /* ReturnYouTubeDislikeAPI.swift in Sources */,
37030FFD27B0398000ECDDAA /* MPVClient.swift in Sources */,
378E9C4229455A5800B2D696 /* ChannelsView.swift in Sources */,
37192D5928B179D60012EEDD /* ChaptersView.swift in Sources */,
37B767DD2677C3CA0098BAA8 /* PlayerModel.swift in Sources */,
373CFAF12697A78B003CB2C6 /* AddToPlaylistView.swift in Sources */,
@ -3568,6 +3587,7 @@
3743CA50270EFE3400E4D32B /* PlayerQueueRow.swift in Sources */,
376BE50827347B57009AD608 /* SettingsHeader.swift in Sources */,
37A9966026D6F9B9006E3224 /* HomeView.swift in Sources */,
372820402945E4A8009A0E2D /* SubscriptionsPageButton.swift in Sources */,
37001565271B1F250049C794 /* AccountsModel.swift in Sources */,
3751B4B427836902000B7DF4 /* SearchPage.swift in Sources */,
377ABC46286E4B74009C986F /* ManifestedInstance.swift in Sources */,
@ -3647,7 +3667,7 @@
373197DA2732060100EF734F /* RelatedView.swift in Sources */,
37DD9DA52785BBC900539416 /* NoCommentsView.swift in Sources */,
377ABC4A286E5887009C986F /* Sequence+Unique.swift in Sources */,
37E6D79E2944AE1A00550C3D /* SubscriptionsViewModel.swift in Sources */,
37E6D79E2944AE1A00550C3D /* FeedModel.swift in Sources */,
37D4B19926717E1500C925CA /* Video.swift in Sources */,
378E50FD26FE8B9F00F49626 /* Instance.swift in Sources */,
37169AA82729E2CC0011DE61 /* AccountsBridge.swift in Sources */,
@ -3667,7 +3687,7 @@
377E17162928265900894889 /* ListRowSeparator+Backport.swift in Sources */,
37FB28432721B22200A57617 /* ContentItem.swift in Sources */,
37D2E0D228B67DBC00F64D52 /* AnimationCompletionObserverModifier.swift in Sources */,
37AAF2A226741C97007FC770 /* SubscriptionsView.swift in Sources */,
37AAF2A226741C97007FC770 /* FeedView.swift in Sources */,
37484C1B26FC837400287258 /* PlayerSettings.swift in Sources */,
372915E82687E3B900F5A35B /* Defaults.swift in Sources */,
37BAB54C269B39FD00E75ED1 /* TVNavigationView.swift in Sources */,