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

separate tvOS View

Browse Source
This commit is contained in:
Toni Förster 2023-11-28 20:05:04 +01:00
parent 4ec6f35c5d
commit 13ef96cd02
No known key found for this signature in database
GPG Key ID: 292F3E5086C83FC7
3 changed files with 136 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
Shared/Player/Video Details/ChapterView.swift
View File

@ -3,65 +3,44 @@ import Foundation
import SDWebImageSwiftUI import SDWebImageSwiftUI
import SwiftUI import SwiftUI
struct ChapterView: View { #if !os(tvOS)
var chapter: Chapter struct ChapterView: View {
var nextChapterStart: Double? var chapter: Chapter
var nextChapterStart: Double?
var chapterIndex: Int var chapterIndex: Int
@ObservedObject private var player = PlayerModel.shared @ObservedObject private var player = PlayerModel.shared
var isCurrentChapter: Bool { var isCurrentChapter: Bool {
player.currentChapterIndex == chapterIndex player.currentChapterIndex == chapterIndex
} }
var hasBeenPlayed: Bool { var hasBeenPlayed: Bool {
player.playedChapters.contains(chapterIndex) player.playedChapters.contains(chapterIndex)
} }
var body: some View { var body: some View {
Button(action: { Button(action: {
player.backend.seek(to: chapter.start, seekType: .userInteracted) player.backend.seek(to: chapter.start, seekType: .userInteracted)
}) { }) {
Group { Group {
#if os(tvOS)
horizontalChapter
#else
verticalChapter verticalChapter
#endif }
.contentShape(Rectangle())
} }
.contentShape(Rectangle()) .buttonStyle(.plain)
}
.buttonStyle(.plain) .onReceive(PlayerTimeModel.shared.$currentTime) { cmTime in
.onReceive(PlayerTimeModel.shared.$currentTime) { cmTime in let time = CMTimeGetSeconds(cmTime)
let time = CMTimeGetSeconds(cmTime) if time >= self.chapter.start, self.nextChapterStart == nil || time < self.nextChapterStart! {
if time >= self.chapter.start, self.nextChapterStart == nil || time < self.nextChapterStart! { player.currentChapterIndex = self.chapterIndex
player.currentChapterIndex = self.chapterIndex if !player.playedChapters.contains(self.chapterIndex) {
if !player.playedChapters.contains(self.chapterIndex) { player.playedChapters.append(self.chapterIndex)
player.playedChapters.append(self.chapterIndex) }
} }
} }
} }
}
#if os(tvOS)
var horizontalChapter: some View {
HStack(spacing: 12) {
if !chapter.image.isNil {
smallImage(chapter)
}
VStack(alignment: .leading, spacing: 4) {
Text(chapter.title)
.font(.headline)
Text(chapter.start.formattedAsPlaybackTime(allowZero: true) ?? "")
.font(.system(.subheadline).monospacedDigit())
.foregroundColor(.secondary)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
}
#else
var verticalChapter: some View { var verticalChapter: some View {
VStack(spacing: 12) { VStack(spacing: 12) {
if !chapter.image.isNil { if !chapter.image.isNil {
@ -80,35 +59,91 @@ struct ChapterView: View {
.frame(maxWidth: !chapter.image.isNil ? Self.thumbnailWidth : nil, alignment: .leading) .frame(maxWidth: !chapter.image.isNil ? Self.thumbnailWidth : nil, alignment: .leading)
} }
} }
#endif
@ViewBuilder func smallImage(_ chapter: Chapter) -> some View { @ViewBuilder func smallImage(_ chapter: Chapter) -> some View {
WebImage(url: chapter.image, options: [.lowPriority]) WebImage(url: chapter.image, options: [.lowPriority])
.resizable() .resizable()
.placeholder { .placeholder {
ProgressView() ProgressView()
}
.indicator(.activity)
.frame(width: Self.thumbnailWidth, height: Self.thumbnailHeight)
.mask(RoundedRectangle(cornerRadius: 6))
}
static var thumbnailWidth: Double {
250
}
static var thumbnailHeight: Double {
thumbnailWidth / 1.7777
}
}
#else
struct ChapterViewTVOS: View {
var chapter: Chapter
var player = PlayerModel.shared
var body: some View {
Button {
player.backend.seek(to: chapter.start, seekType: .userInteracted)
} label: {
Group {
horizontalChapter
}
.contentShape(Rectangle())
} }
.indicator(.activity) .buttonStyle(.plain)
.frame(width: Self.thumbnailWidth, height: Self.thumbnailHeight) }
#if os(tvOS)
.mask(RoundedRectangle(cornerRadius: 12))
#else
.mask(RoundedRectangle(cornerRadius: 6))
#endif
}
static var thumbnailWidth: Double { var horizontalChapter: some View {
250 HStack(spacing: 12) {
} if !chapter.image.isNil {
smallImage(chapter)
}
static var thumbnailHeight: Double { VStack(alignment: .leading, spacing: 4) {
thumbnailWidth / 1.7777 Text(chapter.title)
.font(.headline)
Text(chapter.start.formattedAsPlaybackTime(allowZero: true) ?? "")
.font(.system(.subheadline).monospacedDigit())
.foregroundColor(.secondary)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
}
@ViewBuilder func smallImage(_ chapter: Chapter) -> some View {
WebImage(url: chapter.image, options: [.lowPriority])
.resizable()
.placeholder {
ProgressView()
}
.indicator(.activity)
.frame(width: Self.thumbnailWidth, height: Self.thumbnailHeight)
.mask(RoundedRectangle(cornerRadius: 12))
}
static var thumbnailWidth: Double {
250
}
static var thumbnailHeight: Double {
thumbnailWidth / 1.7777
}
} }
} #endif
struct ChapterView_Preview: PreviewProvider { struct ChapterView_Preview: PreviewProvider {
static var previews: some View { static var previews: some View {
ChapterView(chapter: .init(title: "Chapter", start: 30), chapterIndex: 0) #if os(tvOS)
.injectFixtureEnvironmentObjects() ChapterViewTVOS(chapter: .init(title: "Chapter", start: 30))
.injectFixtureEnvironmentObjects()
#else
ChapterView(chapter: .init(title: "Chapter", start: 30), nextChapterStart: nil, chapterIndex: 0)
.injectFixtureEnvironmentObjects()
#endif
} }
} }

56
Shared/Player/Video Details/ChaptersView.swift
View File

@ -21,7 +21,7 @@ struct ChaptersView: View {
List { List {
Section { Section {
ForEach(chapters) { chapter in ForEach(chapters) { chapter in
ChapterView(chapter: chapter) ChapterViewTVOS(chapter: chapter)
} }
} }
.listRowBackground(Color.clear) .listRowBackground(Color.clear)
@ -29,51 +29,53 @@ struct ChaptersView: View {
.listStyle(.plain) .listStyle(.plain)
#else #else
ScrollView(.horizontal) { ScrollView(.horizontal) {
LazyHStack(spacing: 20) { LazyHStack(spacing: 20) { chapterViews(for: chapters.prefix(3), opacity: 1.0) }.padding(.horizontal, 15)
ForEach(Array(chapters.indices), id: \.self) { index in
let chapter = chapters[index]
let nextChapterStart: Double? = index < chapters.count - 1 ? chapters[index + 1].start : nil
ChapterView(chapter: chapter, nextChapterStart: nextChapterStart, chapterIndex: index)
}
}
.padding(.horizontal, 15)
} }
#endif #endif
} else if expand { } else if expand {
Section { #if os(tvOS)
ForEach(Array(chapters.indices), id: \.self) { index in Section {
let chapter = chapters[index] ForEach(chapters) { chapter in
let nextChapterStart: Double? = index < chapters.count - 1 ? chapters[index + 1].start : nil ChapterViewTVOS(chapter: chapter)
ChapterView(chapter: chapter, nextChapterStart: nextChapterStart, chapterIndex: index) }
} }
} #else
.padding(.horizontal) Section { chapterViews(for: chapters[...], opacity: 1.0) }.padding(.horizontal)
#endif
} else { } else {
#if os(iOS) #if os(iOS)
Button(action: { Button(action: {
self.expand.toggle() self.expand.toggle()
}) { }) {
contents Section {
chapterViews(for: chapters.prefix(3), opacity: 0.3)
}.padding(.horizontal)
} }
#elseif os(macOS)
Section {
chapterViews(for: chapters.prefix(3), opacity: 0.3)
}.padding(.horizontal)
#else #else
contents Section {
ForEach(chapters) { chapter in
ChapterViewTVOS(chapter: chapter)
}
}
#endif #endif
} }
} }
} }
var contents: some View { #if !os(tvOS)
Section { private func chapterViews(for chaptersToShow: ArraySlice<Chapter>, opacity: Double = 1.0) -> some View {
ForEach(Array(chapters.prefix(3).indices), id: \.self) { index in ForEach(Array(chaptersToShow.indices), id: \.self) { index in
let chapter = chapters[index] let chapter = chaptersToShow[index]
let nextChapterStart: Double? = index < chapters.count - 1 ? chapters[index + 1].start : nil let nextChapterStart: Double? = index < chaptersToShow.count - 1 ? chaptersToShow[index + 1].start : nil
ChapterView(chapter: chapter, nextChapterStart: nextChapterStart, chapterIndex: index) ChapterView(chapter: chapter, nextChapterStart: nextChapterStart, chapterIndex: index)
.allowsHitTesting(expand) .opacity(index == 0 ? 1.0 : opacity)
.opacity(index == 0 ? 1.0 : 0.3)
} }
} }
.padding(.horizontal) #endif
}
} }
struct ChaptersView_Previews: PreviewProvider { struct ChaptersView_Previews: PreviewProvider {

2
tvOS/NowPlayingView.swift
View File

@ -130,7 +130,7 @@ struct NowPlayingView: View {
} else { } else {
Section(header: Text("Chapters")) { Section(header: Text("Chapters")) {
ForEach(video.chapters) { chapter in ForEach(video.chapters) { chapter in
ChapterView(chapter: chapter) ChapterViewTVOS(chapter: chapter)
.padding(.horizontal, 40) .padding(.horizontal, 40)
} }
} }