ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tvos

This commit is contained in:
Ethan Pippin 2022-03-18 22:13:27 -06:00
parent a467f0cbd7
commit 9441de86a8
6 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shared/Coordinators/MainCoordinator/tvOSMainCoordinator.swift
View File

@ -40,19 +40,18 @@ final class MainCoordinator: NavigationCoordinatable {
DataLoader.sharedUrlCache.diskCapacity = 1000 * 1024 * 1024 // 1000MB disk DataLoader.sharedUrlCache.diskCapacity = 1000 * 1024 * 1024 // 1000MB disk
// Notification setup for state // Notification setup for state
let nc = SwiftfinNotificationCenter.main Notifications[.didSignIn].subscribe(self, selector: #selector(didSignIn))
nc.addObserver(self, selector: #selector(didLogIn), name: SwiftfinNotificationCenter.Keys.didSignIn, object: nil) Notifications[.didSignOut].subscribe(self, selector: #selector(didSignOut))
nc.addObserver(self, selector: #selector(didLogOut), name: SwiftfinNotificationCenter.Keys.didSignOut, object: nil)
} }
@objc @objc
func didLogIn() { func didSignIn() {
LogManager.shared.log.info("Received `didSignIn` from NSNotificationCenter.") LogManager.shared.log.info("Received `didSignIn` from NSNotificationCenter.")
root(\.mainTab) root(\.mainTab)
} }
@objc @objc
func didLogOut() { func didSignOut() {
LogManager.shared.log.info("Received `didSignOut` from NSNotificationCenter.") LogManager.shared.log.info("Received `didSignOut` from NSNotificationCenter.")
root(\.serverList) root(\.serverList)
} }

9
Swiftfin tvOS/Components/HomeCinematicView/CinematicNextUpCardView.swift
View File

@ -30,11 +30,10 @@ struct CinematicNextUpCardView: View {
]) ])
.frame(width: 350, height: 210) .frame(width: 350, height: 210)
} else { } else {
ImageView(sources: [ ImageView([
item.getThumbImage(maxWidth: 350), .init(url: item.getThumbImage(maxWidth: 350)),
item.getBackdropImage(maxWidth: 350), .init(url: item.getBackdropImage(maxWidth: 350), blurHash: item.getBackdropImageBlurHash()),
], ])
blurHash: item.getBackdropImageBlurHash())
.frame(width: 350, height: 210) .frame(width: 350, height: 210)
} }

9
Swiftfin tvOS/Components/HomeCinematicView/CinematicResumeCardView.swift
View File

@ -31,11 +31,10 @@ struct CinematicResumeCardView: View {
]) ])
.frame(width: 350, height: 210) .frame(width: 350, height: 210)
} else { } else {
ImageView(sources: [ ImageView([
item.getThumbImage(maxWidth: 350), .init(url: item.getThumbImage(maxWidth: 350)),
item.getBackdropImage(maxWidth: 350), .init(url: item.getBackdropImage(maxWidth: 350), blurHash: item.getBackdropImageBlurHash()),
], ])
blurHash: item.getBackdropImageBlurHash())
.frame(width: 350, height: 210) .frame(width: 350, height: 210)
} }

50
Swiftfin tvOS/Views/LibraryListView.swift
View File

@ -38,31 +38,6 @@ struct LibraryListView: View {
self.mainCoordinator.root(\.liveTV) self.mainCoordinator.root(\.liveTV)
} }
label: { label: {
ZStack {
HStack {
Spacer()
VStack {
Text(library.name ?? "")
.foregroundColor(.white)
.font(.title2)
.fontWeight(.semibold)
}
Spacer()
}.padding(32)
}
.frame(minWidth: 100, maxWidth: .infinity)
.frame(height: 100)
}
.cornerRadius(10)
.shadow(radius: 5)
.padding(.bottom, 5)
}
} else {
Button {
self.libraryListRouter.route(to: \.library,
(viewModel: LibraryViewModel(parentID: library.id), title: library.name ?? ""))
}
label: {
ZStack { ZStack {
HStack { HStack {
Spacer() Spacer()
@ -81,6 +56,31 @@ struct LibraryListView: View {
.cornerRadius(10) .cornerRadius(10)
.shadow(radius: 5) .shadow(radius: 5)
.padding(.bottom, 5) .padding(.bottom, 5)
}
} else {
Button {
self.libraryListRouter.route(to: \.library,
(viewModel: LibraryViewModel(parentID: library.id), title: library.name ?? ""))
}
label: {
ZStack {
HStack {
Spacer()
VStack {
Text(library.name ?? "")
.foregroundColor(.white)
.font(.title2)
.fontWeight(.semibold)
}
Spacer()
}.padding(32)
}
.frame(minWidth: 100, maxWidth: .infinity)
.frame(height: 100)
}
.cornerRadius(10)
.shadow(radius: 5)
.padding(.bottom, 5)
} }
} }
} else { } else {

4
Swiftfin tvOS/Views/VideoPlayer/LiveTVPlayerViewController.swift
View File

@ -700,7 +700,7 @@ extension LiveTVPlayerViewController: VLCMediaPlayerDelegate {
// MARK: mediaPlayerStateChanged // MARK: mediaPlayerStateChanged
func mediaPlayerStateChanged(_ aNotification: Notification!) { func mediaPlayerStateChanged(_ aNotification: Notification) {
// Don't show buffering if paused, usually here while scrubbing // Don't show buffering if paused, usually here while scrubbing
if vlcMediaPlayer.state == .buffering && viewModel.playerState == .paused { if vlcMediaPlayer.state == .buffering && viewModel.playerState == .paused {
@ -720,7 +720,7 @@ extension LiveTVPlayerViewController: VLCMediaPlayerDelegate {
// MARK: mediaPlayerTimeChanged // MARK: mediaPlayerTimeChanged
func mediaPlayerTimeChanged(_ aNotification: Notification!) { func mediaPlayerTimeChanged(_ aNotification: Notification) {
if !viewModel.sliderIsScrubbing { if !viewModel.sliderIsScrubbing {
viewModel.sliderPercentage = Double(vlcMediaPlayer.position) viewModel.sliderPercentage = Double(vlcMediaPlayer.position)

4
Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift
View File

@ -700,7 +700,7 @@ extension VLCPlayerViewController: VLCMediaPlayerDelegate {
// MARK: mediaPlayerStateChanged // MARK: mediaPlayerStateChanged
func mediaPlayerStateChanged(_ aNotification: Notification!) { func mediaPlayerStateChanged(_ aNotification: Notification) {
// Don't show buffering if paused, usually here while scrubbing // Don't show buffering if paused, usually here while scrubbing
if vlcMediaPlayer.state == .buffering && viewModel.playerState == .paused { if vlcMediaPlayer.state == .buffering && viewModel.playerState == .paused {
@ -720,7 +720,7 @@ extension VLCPlayerViewController: VLCMediaPlayerDelegate {
// MARK: mediaPlayerTimeChanged // MARK: mediaPlayerTimeChanged
func mediaPlayerTimeChanged(_ aNotification: Notification!) { func mediaPlayerTimeChanged(_ aNotification: Notification) {
if !viewModel.sliderIsScrubbing { if !viewModel.sliderIsScrubbing {
viewModel.sliderPercentage = Double(vlcMediaPlayer.position) viewModel.sliderPercentage = Double(vlcMediaPlayer.position)