From b4be96e6ac0baed074653bf7748e3bbdd6fccd05 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Thu, 16 May 2024 07:32:03 -0600 Subject: [PATCH] tvOS Library Paging (#1057) --- .../LibraryViewModel/ItemTypeLibraryViewModel.swift | 2 ++ Swiftfin tvOS/Components/PagingLibraryView.swift | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Shared/ViewModels/LibraryViewModel/ItemTypeLibraryViewModel.swift b/Shared/ViewModels/LibraryViewModel/ItemTypeLibraryViewModel.swift index aee8af9c..0bf9b6c5 100644 --- a/Shared/ViewModels/LibraryViewModel/ItemTypeLibraryViewModel.swift +++ b/Shared/ViewModels/LibraryViewModel/ItemTypeLibraryViewModel.swift @@ -38,6 +38,8 @@ final class ItemTypeLibraryViewModel: PagingLibraryViewModel { parameters.fields = .MinimumFields parameters.includeItemTypes = itemTypes parameters.isRecursive = true + parameters.sortBy = [ItemSortBy.name.rawValue] + parameters.sortOrder = [.ascending] // Page size if let page { diff --git a/Swiftfin tvOS/Components/PagingLibraryView.swift b/Swiftfin tvOS/Components/PagingLibraryView.swift index 7937da2c..c4044925 100644 --- a/Swiftfin tvOS/Components/PagingLibraryView.swift +++ b/Swiftfin tvOS/Components/PagingLibraryView.swift @@ -14,6 +14,7 @@ import SwiftUI // TODO: Figure out proper tab bar handling with the collection offset // TODO: list columns // TODO: list row view (LibraryRow) +// TODO: fix paging for next item focusing the tab struct PagingLibraryView: View { @@ -157,6 +158,9 @@ struct PagingLibraryView: View { listItemView(item: item) } } + .onReachedBottomEdge(offset: .rows(3)) { + viewModel.send(.getNextPage) + } } var body: some View {