From 9441de86a81eb4eaec53a90cd58dffcefea49695 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Fri, 18 Mar 2022 22:13:27 -0600 Subject: [PATCH] fix tvos --- .../MainCoordinator/tvOSMainCoordinator.swift | 9 ++-- .../CinematicNextUpCardView.swift | 9 ++-- .../CinematicResumeCardView.swift | 9 ++-- Swiftfin tvOS/Views/LibraryListView.swift | 50 +++++++++---------- .../LiveTVPlayerViewController.swift | 4 +- .../VideoPlayer/VLCPlayerViewController.swift | 4 +- 6 files changed, 41 insertions(+), 44 deletions(-) diff --git a/Shared/Coordinators/MainCoordinator/tvOSMainCoordinator.swift b/Shared/Coordinators/MainCoordinator/tvOSMainCoordinator.swift index 632b7790..8e1d6390 100644 --- a/Shared/Coordinators/MainCoordinator/tvOSMainCoordinator.swift +++ b/Shared/Coordinators/MainCoordinator/tvOSMainCoordinator.swift @@ -40,19 +40,18 @@ final class MainCoordinator: NavigationCoordinatable { DataLoader.sharedUrlCache.diskCapacity = 1000 * 1024 * 1024 // 1000MB disk // Notification setup for state - let nc = SwiftfinNotificationCenter.main - nc.addObserver(self, selector: #selector(didLogIn), name: SwiftfinNotificationCenter.Keys.didSignIn, object: nil) - nc.addObserver(self, selector: #selector(didLogOut), name: SwiftfinNotificationCenter.Keys.didSignOut, object: nil) + Notifications[.didSignIn].subscribe(self, selector: #selector(didSignIn)) + Notifications[.didSignOut].subscribe(self, selector: #selector(didSignOut)) } @objc - func didLogIn() { + func didSignIn() { LogManager.shared.log.info("Received `didSignIn` from NSNotificationCenter.") root(\.mainTab) } @objc - func didLogOut() { + func didSignOut() { LogManager.shared.log.info("Received `didSignOut` from NSNotificationCenter.") root(\.serverList) } diff --git a/Swiftfin tvOS/Components/HomeCinematicView/CinematicNextUpCardView.swift b/Swiftfin tvOS/Components/HomeCinematicView/CinematicNextUpCardView.swift index c31a89f9..fa95e274 100644 --- a/Swiftfin tvOS/Components/HomeCinematicView/CinematicNextUpCardView.swift +++ b/Swiftfin tvOS/Components/HomeCinematicView/CinematicNextUpCardView.swift @@ -30,11 +30,10 @@ struct CinematicNextUpCardView: View { ]) .frame(width: 350, height: 210) } else { - ImageView(sources: [ - item.getThumbImage(maxWidth: 350), - item.getBackdropImage(maxWidth: 350), - ], - blurHash: item.getBackdropImageBlurHash()) + ImageView([ + .init(url: item.getThumbImage(maxWidth: 350)), + .init(url: item.getBackdropImage(maxWidth: 350), blurHash: item.getBackdropImageBlurHash()), + ]) .frame(width: 350, height: 210) } diff --git a/Swiftfin tvOS/Components/HomeCinematicView/CinematicResumeCardView.swift b/Swiftfin tvOS/Components/HomeCinematicView/CinematicResumeCardView.swift index 21914da3..8aa188c5 100644 --- a/Swiftfin tvOS/Components/HomeCinematicView/CinematicResumeCardView.swift +++ b/Swiftfin tvOS/Components/HomeCinematicView/CinematicResumeCardView.swift @@ -31,11 +31,10 @@ struct CinematicResumeCardView: View { ]) .frame(width: 350, height: 210) } else { - ImageView(sources: [ - item.getThumbImage(maxWidth: 350), - item.getBackdropImage(maxWidth: 350), - ], - blurHash: item.getBackdropImageBlurHash()) + ImageView([ + .init(url: item.getThumbImage(maxWidth: 350)), + .init(url: item.getBackdropImage(maxWidth: 350), blurHash: item.getBackdropImageBlurHash()), + ]) .frame(width: 350, height: 210) } diff --git a/Swiftfin tvOS/Views/LibraryListView.swift b/Swiftfin tvOS/Views/LibraryListView.swift index 9001544d..4760e74e 100644 --- a/Swiftfin tvOS/Views/LibraryListView.swift +++ b/Swiftfin tvOS/Views/LibraryListView.swift @@ -38,31 +38,6 @@ struct LibraryListView: View { self.mainCoordinator.root(\.liveTV) } 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 { HStack { Spacer() @@ -81,6 +56,31 @@ struct LibraryListView: View { .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 { + 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 { diff --git a/Swiftfin tvOS/Views/VideoPlayer/LiveTVPlayerViewController.swift b/Swiftfin tvOS/Views/VideoPlayer/LiveTVPlayerViewController.swift index d97dbb55..e726e723 100644 --- a/Swiftfin tvOS/Views/VideoPlayer/LiveTVPlayerViewController.swift +++ b/Swiftfin tvOS/Views/VideoPlayer/LiveTVPlayerViewController.swift @@ -700,7 +700,7 @@ extension LiveTVPlayerViewController: VLCMediaPlayerDelegate { // MARK: mediaPlayerStateChanged - func mediaPlayerStateChanged(_ aNotification: Notification!) { + func mediaPlayerStateChanged(_ aNotification: Notification) { // Don't show buffering if paused, usually here while scrubbing if vlcMediaPlayer.state == .buffering && viewModel.playerState == .paused { @@ -720,7 +720,7 @@ extension LiveTVPlayerViewController: VLCMediaPlayerDelegate { // MARK: mediaPlayerTimeChanged - func mediaPlayerTimeChanged(_ aNotification: Notification!) { + func mediaPlayerTimeChanged(_ aNotification: Notification) { if !viewModel.sliderIsScrubbing { viewModel.sliderPercentage = Double(vlcMediaPlayer.position) diff --git a/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift b/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift index 058bd4a9..36382579 100644 --- a/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift +++ b/Swiftfin tvOS/Views/VideoPlayer/VLCPlayerViewController.swift @@ -700,7 +700,7 @@ extension VLCPlayerViewController: VLCMediaPlayerDelegate { // MARK: mediaPlayerStateChanged - func mediaPlayerStateChanged(_ aNotification: Notification!) { + func mediaPlayerStateChanged(_ aNotification: Notification) { // Don't show buffering if paused, usually here while scrubbing if vlcMediaPlayer.state == .buffering && viewModel.playerState == .paused { @@ -720,7 +720,7 @@ extension VLCPlayerViewController: VLCMediaPlayerDelegate { // MARK: mediaPlayerTimeChanged - func mediaPlayerTimeChanged(_ aNotification: Notification!) { + func mediaPlayerTimeChanged(_ aNotification: Notification) { if !viewModel.sliderIsScrubbing { viewModel.sliderPercentage = Double(vlcMediaPlayer.position)