diff --git a/Shared/Coordinators/HomeCoordinator.swift b/Shared/Coordinators/HomeCoordinator.swift index a631d0e4..9e0ee888 100644 --- a/Shared/Coordinators/HomeCoordinator.swift +++ b/Shared/Coordinators/HomeCoordinator.swift @@ -30,15 +30,6 @@ final class HomeCoordinator: NavigationCoordinatable { var library = makeLibrary #endif - #if os(tvOS) - func makeItem(item: BaseItemDto) -> NavigationViewCoordinator { - NavigationViewCoordinator(ItemCoordinator(item: item)) - } - - func makeLibrary(viewModel: PagingLibraryViewModel) -> NavigationViewCoordinator> { - NavigationViewCoordinator(LibraryCoordinator(viewModel: viewModel)) - } - #else func makeItem(item: BaseItemDto) -> ItemCoordinator { ItemCoordinator(item: item) } @@ -46,7 +37,6 @@ final class HomeCoordinator: NavigationCoordinatable { func makeLibrary(viewModel: PagingLibraryViewModel) -> LibraryCoordinator { LibraryCoordinator(viewModel: viewModel) } - #endif @ViewBuilder func makeStart() -> some View { diff --git a/Shared/Coordinators/LibraryCoordinator.swift b/Shared/Coordinators/LibraryCoordinator.swift index 985c381f..f13fbe9f 100644 --- a/Shared/Coordinators/LibraryCoordinator.swift +++ b/Shared/Coordinators/LibraryCoordinator.swift @@ -44,15 +44,6 @@ final class LibraryCoordinator: NavigationCoordinatable { PagingLibraryView(viewModel: viewModel) } - #if os(tvOS) - func makeItem(item: BaseItemDto) -> NavigationViewCoordinator { - NavigationViewCoordinator(ItemCoordinator(item: item)) - } - - func makeLibrary(viewModel: PagingLibraryViewModel) -> NavigationViewCoordinator> { - NavigationViewCoordinator(LibraryCoordinator(viewModel: viewModel)) - } - #else func makeItem(item: BaseItemDto) -> ItemCoordinator { ItemCoordinator(item: item) } @@ -61,6 +52,7 @@ final class LibraryCoordinator: NavigationCoordinatable { LibraryCoordinator(viewModel: viewModel) } + #if !os(tvOS) func makeFilter(parameters: FilterCoordinator.Parameters) -> NavigationViewCoordinator { NavigationViewCoordinator(FilterCoordinator(parameters: parameters)) } diff --git a/Shared/Coordinators/MediaCoordinator.swift b/Shared/Coordinators/MediaCoordinator.swift index 60e91280..8322daee 100644 --- a/Shared/Coordinators/MediaCoordinator.swift +++ b/Shared/Coordinators/MediaCoordinator.swift @@ -18,9 +18,9 @@ final class MediaCoordinator: NavigationCoordinatable { @Root var start = makeStart #if os(tvOS) - @Route(.push) + @Route(.fullScreen) var library = makeLibrary - @Route(.push) + @Route(.fullScreen) var liveTV = makeLiveTV #else @Route(.push) diff --git a/Shared/Coordinators/SearchCoordinator.swift b/Shared/Coordinators/SearchCoordinator.swift index bd40e8a9..3746781f 100644 --- a/Shared/Coordinators/SearchCoordinator.swift +++ b/Shared/Coordinators/SearchCoordinator.swift @@ -31,15 +31,6 @@ final class SearchCoordinator: NavigationCoordinatable { var filter = makeFilter #endif - #if os(tvOS) - func makeItem(item: BaseItemDto) -> NavigationViewCoordinator { - NavigationViewCoordinator(ItemCoordinator(item: item)) - } - - func makeLibrary(viewModel: PagingLibraryViewModel) -> NavigationViewCoordinator> { - NavigationViewCoordinator(LibraryCoordinator(viewModel: viewModel)) - } - #else func makeItem(item: BaseItemDto) -> ItemCoordinator { ItemCoordinator(item: item) } @@ -48,6 +39,7 @@ final class SearchCoordinator: NavigationCoordinatable { LibraryCoordinator(viewModel: viewModel) } + #if !os(tvOS) func makeFilter(parameters: FilterCoordinator.Parameters) -> NavigationViewCoordinator { NavigationViewCoordinator(FilterCoordinator(parameters: parameters)) }