diff --git a/JellyfinPlayer/Views/HomeView.swift b/JellyfinPlayer/Views/HomeView.swift index 71e9f944..16274325 100644 --- a/JellyfinPlayer/Views/HomeView.swift +++ b/JellyfinPlayer/Views/HomeView.swift @@ -68,7 +68,7 @@ struct HomeView: View { ForEach(viewModel.libraries, id: \.self) { library in - LatestMediaView(viewModel: LatestMediaViewModel(libraryID: library.id!)) { + LatestMediaView(viewModel: LatestMediaViewModel(library: library)) { HStack { Text(L10n.latestWithString(library.name ?? "")) .font(.title2) diff --git a/JellyfinPlayer/Views/ItemView/ItemView.swift b/JellyfinPlayer/Views/ItemView/ItemView.swift index 0e257ba7..d127c1d6 100644 --- a/JellyfinPlayer/Views/ItemView/ItemView.swift +++ b/JellyfinPlayer/Views/ItemView/ItemView.swift @@ -51,24 +51,6 @@ private struct ItemView: View { } } - @ViewBuilder - var toolbarItemContent: some View { - switch viewModel.item.itemType { - case .season: - Menu { - Button { - (viewModel as? SeasonItemViewModel)?.routeToSeriesItem() - } label: { - Label("Show Series", systemImage: "text.below.photo") - } - } label: { - Image(systemName: "ellipsis.circle.fill") - } - default: - EmptyView() - } - } - var body: some View { Group { if hSizeClass == .compact && vSizeClass == .regular { @@ -79,10 +61,5 @@ private struct ItemView: View { .environmentObject(viewModel) } } - .toolbar { - ToolbarItemGroup(placement: .navigationBarTrailing) { - toolbarItemContent - } - } } } diff --git a/Shared/ViewModels/SeasonItemViewModel.swift b/Shared/ViewModels/SeasonItemViewModel.swift index d4a8a2dd..78e7edc3 100644 --- a/Shared/ViewModels/SeasonItemViewModel.swift +++ b/Shared/ViewModels/SeasonItemViewModel.swift @@ -73,18 +73,6 @@ final class SeasonItemViewModel: ItemViewModel { } } - func routeToSeriesItem() { - guard let id = item.seriesId else { return } - UserLibraryAPI.getItem(userId: SessionManager.main.currentLogin.user.id, itemId: id) - .trackActivity(loading) - .sink(receiveCompletion: { [weak self] completion in - self?.handleAPIRequestError(completion: completion) - }, receiveValue: { [weak self] item in - self?.itemRouter?.route(to: \.item, item) - }) - .store(in: &cancellables) - } - private func getSeriesItem() { guard let seriesID = item.seriesId else { return } UserLibraryAPI.getItem(userId: SessionManager.main.currentLogin.user.id,