mirror of
https://github.com/yattee/yattee.git
synced 2024-12-22 21:43:41 +00:00
Channel pages
This commit is contained in:
parent
909f035399
commit
33abe4d487
@ -5,6 +5,7 @@ extension Video {
|
|||||||
static var fixtureChannelID: Channel.ID = "channel-fixture"
|
static var fixtureChannelID: Channel.ID = "channel-fixture"
|
||||||
|
|
||||||
static var fixture: Video {
|
static var fixture: Video {
|
||||||
|
let bannerURL = "https://yt3.ggpht.com/SQiRareBDrV2Z6A30HSD0iUABOGysanmKLtaJq7lJ_ME-MtoLb3O61QdlJfH2KhSOA0eKPr_=w2560-fcrop64=1,00005a57ffffa5a8-k-c0xffffffff-no-nd-rj"
|
||||||
let thumbnailURL = "https://yt3.ggpht.com/ytc/AKedOLR-pT_JEsz_hcaA4Gjx8DHcqJ8mS42aTRqcVy6P7w=s88-c-k-c0x00ffffff-no-rj-mo"
|
let thumbnailURL = "https://yt3.ggpht.com/ytc/AKedOLR-pT_JEsz_hcaA4Gjx8DHcqJ8mS42aTRqcVy6P7w=s88-c-k-c0x00ffffff-no-rj-mo"
|
||||||
let chapterImageURL = URL(string: "https://pipedproxy.kavin.rocks/vi/rr2XfL_df3o/hqdefault_29633.jpg?sqp=-oaymwEcCNACELwBSFXyq4qpAw4IARUAAIhCGAFwAcABBg%3D%3D&rs=AOn4CLDFDm9D5SvsIA7D3v5n5KZahLs_UA&host=i.ytimg.com")!
|
let chapterImageURL = URL(string: "https://pipedproxy.kavin.rocks/vi/rr2XfL_df3o/hqdefault_29633.jpg?sqp=-oaymwEcCNACELwBSFXyq4qpAw4IARUAAIhCGAFwAcABBg%3D%3D&rs=AOn4CLDFDm9D5SvsIA7D3v5n5KZahLs_UA&host=i.ytimg.com")!
|
||||||
|
|
||||||
@ -20,8 +21,10 @@ extension Video {
|
|||||||
channel: Channel(
|
channel: Channel(
|
||||||
id: fixtureChannelID,
|
id: fixtureChannelID,
|
||||||
name: "The Channel",
|
name: "The Channel",
|
||||||
|
bannerURL: URL(string: bannerURL)!,
|
||||||
thumbnailURL: URL(string: thumbnailURL)!,
|
thumbnailURL: URL(string: thumbnailURL)!,
|
||||||
subscriptionsCount: 2300,
|
subscriptionsCount: 2300,
|
||||||
|
totalViews: 3_260_378_817,
|
||||||
videos: []
|
videos: []
|
||||||
),
|
),
|
||||||
thumbnails: [],
|
thumbnails: [],
|
||||||
|
@ -154,6 +154,11 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
|
|||||||
content.json.arrayValue.map(self.extractVideo)
|
content.json.arrayValue.map(self.extractVideo)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configureTransformer(pathPattern("channels/*/playlists"), requestMethods: [.get]) { (content: Entity<JSON>) -> [ContentItem] in
|
||||||
|
let playlists = (content.json.dictionaryValue["playlists"]?.arrayValue ?? []).compactMap { self.extractChannelPlaylist(from: $0) }
|
||||||
|
return ContentItem.array(of: playlists)
|
||||||
|
}
|
||||||
|
|
||||||
configureTransformer(pathPattern("playlists/*"), requestMethods: [.get]) { (content: Entity<JSON>) -> ChannelPlaylist in
|
configureTransformer(pathPattern("playlists/*"), requestMethods: [.get]) { (content: Entity<JSON>) -> ChannelPlaylist in
|
||||||
self.extractChannelPlaylist(from: content.json)
|
self.extractChannelPlaylist(from: content.json)
|
||||||
}
|
}
|
||||||
@ -287,8 +292,11 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
|
|||||||
.onCompletion { _ in onCompletion() }
|
.onCompletion { _ in onCompletion() }
|
||||||
}
|
}
|
||||||
|
|
||||||
func channel(_ id: String) -> Resource {
|
func channel(_ id: String, contentType: Channel.ContentType, data _: String?) -> Resource {
|
||||||
resource(baseURL: account.url, path: basePathAppending("channels/\(id)"))
|
if contentType == .playlists {
|
||||||
|
return resource(baseURL: account.url, path: basePathAppending("channels/\(id)/playlists"))
|
||||||
|
}
|
||||||
|
return resource(baseURL: account.url, path: basePathAppending("channels/\(id)"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func channelByName(_: String) -> Resource? {
|
func channelByName(_: String) -> Resource? {
|
||||||
@ -518,9 +526,12 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
|
|||||||
return Channel(
|
return Channel(
|
||||||
id: json["authorId"].stringValue,
|
id: json["authorId"].stringValue,
|
||||||
name: json["author"].stringValue,
|
name: json["author"].stringValue,
|
||||||
|
bannerURL: json["authorBanners"].arrayValue.first?.dictionaryValue["url"]?.url,
|
||||||
thumbnailURL: URL(string: thumbnailURL),
|
thumbnailURL: URL(string: thumbnailURL),
|
||||||
|
description: json["description"].stringValue,
|
||||||
subscriptionsCount: json["subCount"].int,
|
subscriptionsCount: json["subCount"].int,
|
||||||
subscriptionsText: json["subCountText"].string,
|
subscriptionsText: json["subCountText"].string,
|
||||||
|
totalViews: json["totalViews"].int,
|
||||||
videos: json.dictionaryValue["latestVideos"]?.arrayValue.map(extractVideo) ?? []
|
videos: json.dictionaryValue["latestVideos"]?.arrayValue.map(extractVideo) ?? []
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -532,7 +543,8 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
|
|||||||
title: details["title"]?.stringValue ?? "",
|
title: details["title"]?.stringValue ?? "",
|
||||||
thumbnailURL: details["playlistThumbnail"]?.url,
|
thumbnailURL: details["playlistThumbnail"]?.url,
|
||||||
channel: extractChannel(from: json),
|
channel: extractChannel(from: json),
|
||||||
videos: details["videos"]?.arrayValue.compactMap(extractVideo) ?? []
|
videos: details["videos"]?.arrayValue.compactMap(extractVideo) ?? [],
|
||||||
|
videosCount: details["videoCount"]?.int
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,6 +40,10 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
|
|||||||
self.extractChannel(from: content.json)
|
self.extractChannel(from: content.json)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configureTransformer(pathPattern("channels/tabs*")) { (content: Entity<JSON>) -> [ContentItem] in
|
||||||
|
(content.json.dictionaryValue["content"]?.arrayValue ?? []).compactMap { self.extractContentItem(from: $0) }
|
||||||
|
}
|
||||||
|
|
||||||
configureTransformer(pathPattern("c/*")) { (content: Entity<JSON>) -> Channel? in
|
configureTransformer(pathPattern("c/*")) { (content: Entity<JSON>) -> Channel? in
|
||||||
self.extractChannel(from: content.json)
|
self.extractChannel(from: content.json)
|
||||||
}
|
}
|
||||||
@ -147,8 +151,13 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
|
|||||||
resource(baseURL: account.url, path: "login")
|
resource(baseURL: account.url, path: "login")
|
||||||
}
|
}
|
||||||
|
|
||||||
func channel(_ id: String) -> Resource {
|
func channel(_ id: String, contentType: Channel.ContentType, data: String?) -> Resource {
|
||||||
resource(baseURL: account.url, path: "channel/\(id)")
|
if contentType == .videos {
|
||||||
|
return resource(baseURL: account.url, path: "channel/\(id)")
|
||||||
|
}
|
||||||
|
|
||||||
|
return resource(baseURL: account.url, path: "channels/tabs")
|
||||||
|
.withParam("data", data)
|
||||||
}
|
}
|
||||||
|
|
||||||
func channelByName(_ name: String) -> Resource? {
|
func channelByName(_ name: String) -> Resource? {
|
||||||
@ -160,7 +169,7 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func channelVideos(_ id: String) -> Resource {
|
func channelVideos(_ id: String) -> Resource {
|
||||||
channel(id)
|
channel(id, contentType: .videos)
|
||||||
}
|
}
|
||||||
|
|
||||||
func channelPlaylist(_ id: String) -> Resource? {
|
func channelPlaylist(_ id: String) -> Resource? {
|
||||||
@ -385,12 +394,25 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
|
|||||||
attributes["avatar"]?.url ??
|
attributes["avatar"]?.url ??
|
||||||
attributes["thumbnail"]?.url
|
attributes["thumbnail"]?.url
|
||||||
|
|
||||||
|
let tabs = attributes["tabs"]?.arrayValue.compactMap { tab in
|
||||||
|
let name = tab["name"].string
|
||||||
|
let data = tab["data"].string
|
||||||
|
if let name, let data, let type = Channel.ContentType(rawValue: name) {
|
||||||
|
return Channel.Tab(contentType: type, data: data)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
} ?? [Channel.Tab]()
|
||||||
|
|
||||||
return Channel(
|
return Channel(
|
||||||
id: id,
|
id: id,
|
||||||
name: name,
|
name: name,
|
||||||
|
bannerURL: attributes["bannerUrl"]?.url,
|
||||||
thumbnailURL: thumbnailURL,
|
thumbnailURL: thumbnailURL,
|
||||||
subscriptionsCount: subscriptionsCount,
|
subscriptionsCount: subscriptionsCount,
|
||||||
videos: videos
|
verified: attributes["verified"]?.bool,
|
||||||
|
videos: videos,
|
||||||
|
tabs: tabs
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ protocol VideosAPI {
|
|||||||
var account: Account! { get }
|
var account: Account! { get }
|
||||||
var signedIn: Bool { get }
|
var signedIn: Bool { get }
|
||||||
|
|
||||||
func channel(_ id: String) -> Resource
|
func channel(_ id: String, contentType: Channel.ContentType, data: String?) -> Resource
|
||||||
func channelByName(_ name: String) -> Resource?
|
func channelByName(_ name: String) -> Resource?
|
||||||
func channelByUsername(_ username: String) -> Resource?
|
func channelByUsername(_ username: String) -> Resource?
|
||||||
func channelVideos(_ id: String) -> Resource
|
func channelVideos(_ id: String) -> Resource
|
||||||
@ -70,6 +70,10 @@ protocol VideosAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
extension VideosAPI {
|
extension VideosAPI {
|
||||||
|
func channel(_ id: String, contentType: Channel.ContentType, data: String? = nil) -> Resource {
|
||||||
|
channel(id, contentType: contentType, data: data)
|
||||||
|
}
|
||||||
|
|
||||||
func loadDetails(
|
func loadDetails(
|
||||||
_ item: PlayerQueueItem,
|
_ item: PlayerQueueItem,
|
||||||
failureHandler: ((RequestError) -> Void)? = nil,
|
failureHandler: ((RequestError) -> Void)? = nil,
|
||||||
|
@ -4,29 +4,56 @@ import Foundation
|
|||||||
import SwiftyJSON
|
import SwiftyJSON
|
||||||
|
|
||||||
struct Channel: Identifiable, Hashable {
|
struct Channel: Identifiable, Hashable {
|
||||||
|
enum ContentType: String, Identifiable {
|
||||||
|
case videos
|
||||||
|
case playlists
|
||||||
|
case livestreams
|
||||||
|
case shorts
|
||||||
|
case channels
|
||||||
|
|
||||||
|
var id: String {
|
||||||
|
rawValue
|
||||||
|
}
|
||||||
|
|
||||||
|
var contentItemType: ContentItem.ContentType {
|
||||||
|
switch self {
|
||||||
|
case .videos:
|
||||||
|
return .video
|
||||||
|
case .playlists:
|
||||||
|
return .playlist
|
||||||
|
case .livestreams:
|
||||||
|
return .video
|
||||||
|
case .shorts:
|
||||||
|
return .video
|
||||||
|
case .channels:
|
||||||
|
return .channel
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Tab: Identifiable, Hashable {
|
||||||
|
var contentType: ContentType
|
||||||
|
var data: String
|
||||||
|
|
||||||
|
var id: String {
|
||||||
|
contentType.id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var id: String
|
var id: String
|
||||||
var name: String
|
var name: String
|
||||||
|
var bannerURL: URL?
|
||||||
var thumbnailURL: URL?
|
var thumbnailURL: URL?
|
||||||
|
var description = ""
|
||||||
|
|
||||||
|
var subscriptionsCount: Int?
|
||||||
|
var subscriptionsText: String?
|
||||||
|
|
||||||
|
var totalViews: Int?
|
||||||
|
var verified: Bool? // swiftlint:disable discouraged_optional_boolean
|
||||||
|
|
||||||
var videos = [Video]()
|
var videos = [Video]()
|
||||||
|
var tabs = [Tab]()
|
||||||
private var subscriptionsCount: Int?
|
|
||||||
private var subscriptionsText: String?
|
|
||||||
|
|
||||||
init(
|
|
||||||
id: String,
|
|
||||||
name: String,
|
|
||||||
thumbnailURL: URL? = nil,
|
|
||||||
subscriptionsCount: Int? = nil,
|
|
||||||
subscriptionsText: String? = nil,
|
|
||||||
videos: [Video] = []
|
|
||||||
) {
|
|
||||||
self.id = id
|
|
||||||
self.name = name
|
|
||||||
self.thumbnailURL = thumbnailURL
|
|
||||||
self.subscriptionsCount = subscriptionsCount
|
|
||||||
self.subscriptionsText = subscriptionsText
|
|
||||||
self.videos = videos
|
|
||||||
}
|
|
||||||
|
|
||||||
var detailsLoaded: Bool {
|
var detailsLoaded: Bool {
|
||||||
!subscriptionsString.isNil
|
!subscriptionsString.isNil
|
||||||
@ -40,7 +67,17 @@ struct Channel: Identifiable, Hashable {
|
|||||||
return subscriptionsText
|
return subscriptionsText
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var totalViewsString: String? {
|
||||||
|
guard let totalViews, totalViews > 0 else { return nil }
|
||||||
|
|
||||||
|
return totalViews.formattedAsAbbreviation()
|
||||||
|
}
|
||||||
|
|
||||||
func hash(into hasher: inout Hasher) {
|
func hash(into hasher: inout Hasher) {
|
||||||
hasher.combine(id)
|
hasher.combine(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var contentItem: ContentItem {
|
||||||
|
ContentItem(channel: self)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,6 +30,14 @@ struct ContentItem: Identifiable {
|
|||||||
videos.map { ContentItem(video: $0) }
|
videos.map { ContentItem(video: $0) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static func array(of playlists: [ChannelPlaylist]) -> [ContentItem] {
|
||||||
|
playlists.map { ContentItem(playlist: $0) }
|
||||||
|
}
|
||||||
|
|
||||||
|
static func array(of channels: [Channel]) -> [ContentItem] {
|
||||||
|
channels.map { ContentItem(channel: $0) }
|
||||||
|
}
|
||||||
|
|
||||||
static func < (lhs: ContentItem, rhs: ContentItem) -> Bool {
|
static func < (lhs: ContentItem, rhs: ContentItem) -> Bool {
|
||||||
lhs.contentType < rhs.contentType
|
lhs.contentType < rhs.contentType
|
||||||
}
|
}
|
||||||
|
@ -138,6 +138,7 @@ final class NavigationModel: ObservableObject {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
hideKeyboard()
|
hideKeyboard()
|
||||||
|
presentingChannel = false
|
||||||
let presentingPlayer = player.presentingPlayer
|
let presentingPlayer = player.presentingPlayer
|
||||||
player.hide()
|
player.hide()
|
||||||
|
|
||||||
|
@ -79,9 +79,6 @@ struct HomeView: View {
|
|||||||
FavoriteItemView(item: item, dragging: $dragging)
|
FavoriteItemView(item: item, dragging: $dragging)
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#if os(iOS)
|
|
||||||
let first = favorites.first
|
|
||||||
#endif
|
|
||||||
ForEach(favorites) { item in
|
ForEach(favorites) { item in
|
||||||
FavoriteItemView(item: item, dragging: $dragging)
|
FavoriteItemView(item: item, dragging: $dragging)
|
||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
|
@ -207,7 +207,7 @@ struct OpenURLHandler {
|
|||||||
|
|
||||||
private func resourceForChannelUrl(_ parser: URLParser) -> Resource? {
|
private func resourceForChannelUrl(_ parser: URLParser) -> Resource? {
|
||||||
if let id = parser.channelID {
|
if let id = parser.channelID {
|
||||||
return accounts.api.channel(id)
|
return accounts.api.channel(id, contentType: .videos)
|
||||||
}
|
}
|
||||||
|
|
||||||
if let resource = resourceForUsernameUrl(parser) {
|
if let resource = resourceForUsernameUrl(parser) {
|
||||||
|
@ -31,10 +31,6 @@ struct SearchView: View {
|
|||||||
|
|
||||||
private var videos = [Video]()
|
private var videos = [Video]()
|
||||||
|
|
||||||
var items: [ContentItem] {
|
|
||||||
state.store.collection.sorted { $0 < $1 }
|
|
||||||
}
|
|
||||||
|
|
||||||
init(_ query: SearchQuery? = nil, videos: [Video] = []) {
|
init(_ query: SearchQuery? = nil, videos: [Video] = []) {
|
||||||
self.query = query
|
self.query = query
|
||||||
self.videos = videos
|
self.videos = videos
|
||||||
@ -233,12 +229,12 @@ struct SearchView: View {
|
|||||||
.font(.system(size: 25))
|
.font(.system(size: 25))
|
||||||
}
|
}
|
||||||
|
|
||||||
HorizontalCells(items: items)
|
HorizontalCells(items: state.store.collection)
|
||||||
.environment(\.loadMoreContentHandler) { state.loadNextPage() }
|
.environment(\.loadMoreContentHandler) { state.loadNextPage() }
|
||||||
}
|
}
|
||||||
.edgesIgnoringSafeArea(.horizontal)
|
.edgesIgnoringSafeArea(.horizontal)
|
||||||
#else
|
#else
|
||||||
VerticalCells(items: items, allowEmpty: state.query.isEmpty)
|
VerticalCells(items: state.store.collection, allowEmpty: state.query.isEmpty)
|
||||||
.environment(\.loadMoreContentHandler) { state.loadNextPage() }
|
.environment(\.loadMoreContentHandler) { state.loadNextPage() }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -278,7 +274,7 @@ struct SearchView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private var noResults: Bool {
|
private var noResults: Bool {
|
||||||
items.isEmpty && !state.isLoading && !state.query.isEmpty
|
state.store.collection.isEmpty && !state.isLoading && !state.query.isEmpty
|
||||||
}
|
}
|
||||||
|
|
||||||
private var recentQueries: some View {
|
private var recentQueries: some View {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import Defaults
|
import Defaults
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct VerticalCells: View {
|
struct VerticalCells<Header: View>: View {
|
||||||
#if os(iOS)
|
#if os(iOS)
|
||||||
@Environment(\.verticalSizeClass) private var verticalSizeClass
|
@Environment(\.verticalSizeClass) private var verticalSizeClass
|
||||||
#endif
|
#endif
|
||||||
@ -12,12 +12,25 @@ struct VerticalCells: View {
|
|||||||
var items = [ContentItem]()
|
var items = [ContentItem]()
|
||||||
var allowEmpty = false
|
var allowEmpty = false
|
||||||
|
|
||||||
|
let header: Header?
|
||||||
|
init(items: [ContentItem], allowEmpty: Bool = false, @ViewBuilder header: @escaping () -> Header? = { nil }) {
|
||||||
|
self.items = items
|
||||||
|
self.allowEmpty = allowEmpty
|
||||||
|
self.header = header()
|
||||||
|
}
|
||||||
|
|
||||||
|
init(items: [ContentItem], allowEmpty: Bool = false) where Header == EmptyView {
|
||||||
|
self.init(items: items, allowEmpty: allowEmpty) { EmptyView() }
|
||||||
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
ScrollView(.vertical, showsIndicators: scrollViewShowsIndicators) {
|
ScrollView(.vertical, showsIndicators: scrollViewShowsIndicators) {
|
||||||
LazyVGrid(columns: columns, alignment: .center) {
|
LazyVGrid(columns: columns, alignment: .center) {
|
||||||
ForEach(contentItems) { item in
|
Section(header: header) {
|
||||||
ContentItemView(item: item)
|
ForEach(contentItems) { item in
|
||||||
.onAppear { loadMoreContentItemsIfNeeded(current: item) }
|
ContentItemView(item: item)
|
||||||
|
.onAppear { loadMoreContentItemsIfNeeded(current: item) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.padding()
|
.padding()
|
||||||
|
@ -10,14 +10,7 @@ struct ChannelPlaylistCell: View {
|
|||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Button {
|
Button {
|
||||||
let recent = RecentItem(from: playlist)
|
NavigationModel.shared.openChannelPlaylist(playlist, navigationStyle: navigationStyle)
|
||||||
RecentsModel.shared.add(recent)
|
|
||||||
navigation.presentingPlaylist = true
|
|
||||||
|
|
||||||
if navigationStyle == .sidebar {
|
|
||||||
navigation.sidebarSectionChanged.toggle()
|
|
||||||
navigation.tabSelection = .recentlyOpened(recent.tag)
|
|
||||||
}
|
|
||||||
} label: {
|
} label: {
|
||||||
content
|
content
|
||||||
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
|
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import SDWebImageSwiftUI
|
||||||
import Siesta
|
import Siesta
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@ -8,6 +9,9 @@ struct ChannelVideosView: View {
|
|||||||
@State private var shareURL: URL?
|
@State private var shareURL: URL?
|
||||||
@State private var subscriptionToggleButtonDisabled = false
|
@State private var subscriptionToggleButtonDisabled = false
|
||||||
|
|
||||||
|
@State private var contentType = Channel.ContentType.videos
|
||||||
|
@StateObject private var contentTypeItems = Store<[ContentItem]>()
|
||||||
|
|
||||||
@StateObject private var store = Store<Channel>()
|
@StateObject private var store = Store<Channel>()
|
||||||
|
|
||||||
@Environment(\.colorScheme) private var colorScheme
|
@Environment(\.colorScheme) private var colorScheme
|
||||||
@ -24,11 +28,15 @@ struct ChannelVideosView: View {
|
|||||||
@Namespace private var focusNamespace
|
@Namespace private var focusNamespace
|
||||||
|
|
||||||
var presentedChannel: Channel? {
|
var presentedChannel: Channel? {
|
||||||
channel ?? recents.presentedChannel
|
store.item ?? channel ?? recents.presentedChannel
|
||||||
}
|
}
|
||||||
|
|
||||||
var videos: [ContentItem] {
|
var contentItems: [ContentItem] {
|
||||||
ContentItem.array(of: store.item?.videos ?? [])
|
guard contentType != .videos else {
|
||||||
|
return ContentItem.array(of: presentedChannel?.videos ?? [])
|
||||||
|
}
|
||||||
|
|
||||||
|
return contentTypeItems.collection
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
@ -48,30 +56,36 @@ struct ChannelVideosView: View {
|
|||||||
var content: some View {
|
var content: some View {
|
||||||
let content = VStack {
|
let content = VStack {
|
||||||
#if os(tvOS)
|
#if os(tvOS)
|
||||||
HStack {
|
VStack {
|
||||||
Text(navigationTitle)
|
HStack(spacing: 24) {
|
||||||
.font(.title2)
|
thumbnail
|
||||||
.frame(alignment: .leading)
|
|
||||||
|
|
||||||
Spacer()
|
Text(navigationTitle)
|
||||||
|
.font(.title2)
|
||||||
|
.frame(alignment: .leading)
|
||||||
|
|
||||||
if let channel = presentedChannel {
|
Spacer()
|
||||||
FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
|
|
||||||
.labelStyle(.iconOnly)
|
subscriptionsLabel
|
||||||
|
viewsLabel
|
||||||
|
|
||||||
|
subscriptionToggleButton
|
||||||
|
|
||||||
|
if let channel = presentedChannel {
|
||||||
|
FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
|
||||||
|
.labelStyle(.iconOnly)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
contentTypePicker
|
||||||
if let subscribers = store.item?.subscriptionsString {
|
.pickerStyle(.automatic)
|
||||||
Text("**\(subscribers)** subscribers")
|
|
||||||
.foregroundColor(.secondary)
|
|
||||||
}
|
|
||||||
|
|
||||||
subscriptionToggleButton
|
|
||||||
}
|
}
|
||||||
.frame(maxWidth: .infinity)
|
.frame(maxWidth: .infinity)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VerticalCells(items: videos)
|
VerticalCells(items: contentItems) {
|
||||||
.environment(\.inChannelView, true)
|
banner
|
||||||
|
}
|
||||||
|
.environment(\.inChannelView, true)
|
||||||
#if os(tvOS)
|
#if os(tvOS)
|
||||||
.prefersDefaultFocus(in: focusNamespace)
|
.prefersDefaultFocus(in: focusNamespace)
|
||||||
#endif
|
#endif
|
||||||
@ -79,6 +93,11 @@ struct ChannelVideosView: View {
|
|||||||
|
|
||||||
#if !os(tvOS)
|
#if !os(tvOS)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
|
#if os(iOS)
|
||||||
|
ToolbarItem(placement: .principal) {
|
||||||
|
channelMenu
|
||||||
|
}
|
||||||
|
#endif
|
||||||
ToolbarItem(placement: .cancellationAction) {
|
ToolbarItem(placement: .cancellationAction) {
|
||||||
if navigationStyle == .tab {
|
if navigationStyle == .tab {
|
||||||
Button {
|
Button {
|
||||||
@ -88,38 +107,41 @@ struct ChannelVideosView: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Label("Close", systemImage: "xmark")
|
Label("Close", systemImage: "xmark")
|
||||||
}
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if !os(iOS)
|
||||||
|
ToolbarItem(placement: .navigation) {
|
||||||
|
thumbnail
|
||||||
|
}
|
||||||
|
ToolbarItem {
|
||||||
|
contentTypePicker
|
||||||
|
}
|
||||||
|
|
||||||
ToolbarItem {
|
ToolbarItem {
|
||||||
HStack {
|
|
||||||
HStack(spacing: 3) {
|
HStack(spacing: 3) {
|
||||||
Text("\(store.item?.subscriptionsString ?? "")")
|
subscriptionsLabel
|
||||||
.fontWeight(.bold)
|
viewsLabel
|
||||||
|
|
||||||
let subscribers = Text(" subscribers")
|
|
||||||
.allowsTightening(true)
|
|
||||||
.foregroundColor(.secondary)
|
|
||||||
.opacity(store.item?.subscriptionsString != nil ? 1 : 0)
|
|
||||||
|
|
||||||
#if os(iOS)
|
|
||||||
if navigationStyle == .sidebar {
|
|
||||||
subscribers
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
subscribers
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
ShareButton(contentItem: contentItem)
|
|
||||||
|
|
||||||
subscriptionToggleButton
|
|
||||||
|
|
||||||
if let channel = presentedChannel {
|
|
||||||
FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
ToolbarItem {
|
||||||
|
if let contentItem = presentedChannel?.contentItem {
|
||||||
|
ShareButton(contentItem: contentItem)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ToolbarItem {
|
||||||
|
subscriptionToggleButton
|
||||||
|
.layoutPriority(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
ToolbarItem {
|
||||||
|
if let presentedChannel {
|
||||||
|
FavoriteButton(item: FavoriteItem(section: .channel(presentedChannel.id, presentedChannel.name)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
.onAppear {
|
.onAppear {
|
||||||
@ -131,6 +153,12 @@ struct ChannelVideosView: View {
|
|||||||
resource?.loadIfNeeded()
|
resource?.loadIfNeeded()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.onChange(of: contentType) { _ in
|
||||||
|
resource?.load()
|
||||||
|
}
|
||||||
|
#if os(iOS)
|
||||||
|
.navigationBarTitleDisplayMode(.inline)
|
||||||
|
#endif
|
||||||
#if !os(tvOS)
|
#if !os(tvOS)
|
||||||
.navigationTitle(navigationTitle)
|
.navigationTitle(navigationTitle)
|
||||||
#endif
|
#endif
|
||||||
@ -150,13 +178,143 @@ struct ChannelVideosView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var resource: Resource? {
|
var thumbnail: some View {
|
||||||
guard let channel = presentedChannel else {
|
Group {
|
||||||
return nil
|
if let thumbnail = store.item?.thumbnailURL {
|
||||||
}
|
WebImage(url: thumbnail)
|
||||||
|
.resizable()
|
||||||
|
} else {
|
||||||
|
ZStack {
|
||||||
|
Color(white: 0.6)
|
||||||
|
.opacity(0.5)
|
||||||
|
|
||||||
let resource = accounts.api.channel(channel.id)
|
Image(systemName: "play.rectangle")
|
||||||
resource.addObserver(store)
|
.foregroundColor(.accentColor)
|
||||||
|
.imageScale(.small)
|
||||||
|
.contentShape(Rectangle())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#if os(tvOS)
|
||||||
|
.frame(width: 80, height: 80, alignment: .trailing)
|
||||||
|
#else
|
||||||
|
.frame(width: 30, height: 30, alignment: .trailing)
|
||||||
|
#endif
|
||||||
|
.clipShape(Circle())
|
||||||
|
}
|
||||||
|
|
||||||
|
@ViewBuilder var banner: some View {
|
||||||
|
if let banner = presentedChannel?.bannerURL {
|
||||||
|
WebImage(url: banner)
|
||||||
|
.resizable()
|
||||||
|
.placeholder { Color.clear.frame(height: 0) }
|
||||||
|
.scaledToFit()
|
||||||
|
.clipShape(RoundedRectangle(cornerRadius: 3))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var subscriptionsLabel: some View {
|
||||||
|
HStack(spacing: 0) {
|
||||||
|
if let subscribers = presentedChannel?.subscriptionsString {
|
||||||
|
Text(subscribers)
|
||||||
|
} else {
|
||||||
|
Text("1234")
|
||||||
|
.redacted(reason: .placeholder)
|
||||||
|
}
|
||||||
|
|
||||||
|
Image(systemName: "person.2.fill")
|
||||||
|
.imageScale(.small)
|
||||||
|
}
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
}
|
||||||
|
|
||||||
|
var viewsLabel: some View {
|
||||||
|
HStack(spacing: 0) {
|
||||||
|
if let views = presentedChannel?.totalViewsString {
|
||||||
|
Text(views)
|
||||||
|
|
||||||
|
Image(systemName: "eye.fill")
|
||||||
|
.imageScale(.small)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !os(tvOS)
|
||||||
|
var channelMenu: some View {
|
||||||
|
Menu {
|
||||||
|
if let channel = presentedChannel {
|
||||||
|
contentTypePicker
|
||||||
|
Section {
|
||||||
|
subscriptionToggleButton
|
||||||
|
FavoriteButton(item: FavoriteItem(section: .channel(channel.id, channel.name)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} label: {
|
||||||
|
HStack(spacing: 12) {
|
||||||
|
thumbnail
|
||||||
|
|
||||||
|
VStack(alignment: .leading) {
|
||||||
|
Text(presentedChannel?.name ?? "Channel")
|
||||||
|
.font(.headline)
|
||||||
|
.foregroundColor(.primary)
|
||||||
|
.layoutPriority(1)
|
||||||
|
.frame(minWidth: 120, alignment: .leading)
|
||||||
|
|
||||||
|
Group {
|
||||||
|
HStack(spacing: 12) {
|
||||||
|
subscriptionsLabel
|
||||||
|
|
||||||
|
if presentedChannel?.verified ?? false {
|
||||||
|
Text("Verified")
|
||||||
|
}
|
||||||
|
|
||||||
|
viewsLabel
|
||||||
|
}
|
||||||
|
.frame(minWidth: 120, alignment: .leading)
|
||||||
|
}
|
||||||
|
.font(.caption2.bold())
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
}
|
||||||
|
|
||||||
|
Image(systemName: "chevron.down.circle.fill")
|
||||||
|
.foregroundColor(.accentColor)
|
||||||
|
.imageScale(.small)
|
||||||
|
}
|
||||||
|
.frame(maxWidth: 300)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private var contentTypePicker: some View {
|
||||||
|
Picker("Content type", selection: $contentType) {
|
||||||
|
if let channel = presentedChannel {
|
||||||
|
Text("Videos").tag(Channel.ContentType.videos)
|
||||||
|
Text("Playlists").tag(Channel.ContentType.playlists)
|
||||||
|
|
||||||
|
if channel.tabs.contains(where: { $0.contentType == .livestreams }) {
|
||||||
|
Text("Live streams").tag(Channel.ContentType.livestreams)
|
||||||
|
}
|
||||||
|
if channel.tabs.contains(where: { $0.contentType == .shorts }) {
|
||||||
|
Text("Shorts").tag(Channel.ContentType.shorts)
|
||||||
|
}
|
||||||
|
if channel.tabs.contains(where: { $0.contentType == .channels }) {
|
||||||
|
Text("Channels").tag(Channel.ContentType.channels)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var resource: Resource? {
|
||||||
|
guard let channel = presentedChannel else { return nil }
|
||||||
|
|
||||||
|
let data = contentType != .videos ? channel.tabs.first(where: { $0.contentType == contentType })?.data : nil
|
||||||
|
let resource = accounts.api.channel(channel.id, contentType: contentType, data: data)
|
||||||
|
if contentType == .videos {
|
||||||
|
resource.addObserver(store)
|
||||||
|
} else {
|
||||||
|
resource.addObserver(contentTypeItems)
|
||||||
|
}
|
||||||
|
|
||||||
return resource
|
return resource
|
||||||
}
|
}
|
||||||
@ -203,18 +361,21 @@ struct ChannelVideosView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var contentItem: ContentItem {
|
|
||||||
ContentItem(channel: presentedChannel)
|
|
||||||
}
|
|
||||||
|
|
||||||
private var navigationTitle: String {
|
private var navigationTitle: String {
|
||||||
presentedChannel?.name ?? store.item?.name ?? "No channel"
|
presentedChannel?.name ?? "No channel"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ChannelVideosView_Previews: PreviewProvider {
|
struct ChannelVideosView_Previews: PreviewProvider {
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
ChannelVideosView(channel: Video.fixture.channel)
|
ChannelVideosView(channel: Video.fixture.channel)
|
||||||
|
.environment(\.navigationStyle, .tab)
|
||||||
.injectFixtureEnvironmentObjects()
|
.injectFixtureEnvironmentObjects()
|
||||||
|
|
||||||
|
NavigationView {
|
||||||
|
Spacer()
|
||||||
|
ChannelVideosView(channel: Video.fixture.channel)
|
||||||
|
.environment(\.navigationStyle, .sidebar)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user