From bfe557c86c7b8799b6a85648f71c7c632f167609 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Thu, 6 Jan 2022 11:03:51 -0700 Subject: [PATCH] remove navigationlink --- .../ItemView/CompactItemView/EpisodeItemView.swift | 11 +++++++---- .../ItemView/CompactItemView/MovieItemView.swift | 14 +++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/EpisodeItemView.swift b/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/EpisodeItemView.swift index a1033cc7..cb30a302 100644 --- a/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/EpisodeItemView.swift +++ b/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/EpisodeItemView.swift @@ -136,10 +136,13 @@ struct EpisodeItemView: View { ScrollView(.horizontal) { LazyHStack { Spacer().frame(width: 45) - ForEach(viewModel.similarItems, id: \.id) { similarItems in - NavigationLink(destination: ItemView(item: similarItems)) { - PortraitItemElement(item: similarItems) - }.buttonStyle(PlainNavigationLinkButtonStyle()) + ForEach(viewModel.similarItems, id: \.id) { similarItem in + Button { + itemRouter.route(to: \.item, similarItem) + } label: { + PortraitItemElement(item: similarItem) + } + .buttonStyle(PlainNavigationLinkButtonStyle()) } Spacer().frame(width: 45) } diff --git a/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/MovieItemView.swift b/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/MovieItemView.swift index 32afd5e3..dbe04c5e 100644 --- a/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/MovieItemView.swift +++ b/JellyfinPlayer tvOS/Views/ItemView/CompactItemView/MovieItemView.swift @@ -11,12 +11,13 @@ import SwiftUI import JellyfinAPI struct MovieItemView: View { + + @EnvironmentObject var itemRouter: ItemCoordinator.Router @ObservedObject var viewModel: MovieItemViewModel @State var actors: [BaseItemPerson] = [] @State var studio: String? @State var director: String? - @State var wrappedScrollView: UIScrollView? @Namespace private var namespace @@ -141,10 +142,13 @@ struct MovieItemView: View { ScrollView(.horizontal) { LazyHStack { Spacer().frame(width: 45) - ForEach(viewModel.similarItems, id: \.id) { similarItems in - NavigationLink(destination: ItemView(item: similarItems)) { - PortraitItemElement(item: similarItems) - }.buttonStyle(PlainNavigationLinkButtonStyle()) + ForEach(viewModel.similarItems, id: \.id) { similarItem in + Button { + itemRouter.route(to: \.item, similarItem) + } label: { + PortraitItemElement(item: similarItem) + } + .buttonStyle(PlainNavigationLinkButtonStyle()) } Spacer().frame(width: 45) }