feedback cleanup
This commit is contained in:
parent
db6483ed5e
commit
ffde1c468d
|
@ -82,17 +82,6 @@ struct LibraryView: View {
|
|||
} else {
|
||||
Text("No results.")
|
||||
}
|
||||
/*
|
||||
.sheet(isPresented: $isShowingFilterView) {
|
||||
LibraryFilterView(filters: $viewModel.filters, enabledFilterType: viewModel.enabledFilterType, parentId: viewModel.parentID ?? "")
|
||||
}
|
||||
.background(
|
||||
NavigationLink(destination: LibrarySearchView(viewModel: .init(parentID: viewModel.parentID)),
|
||||
isActive: $isShowingSearchView) {
|
||||
EmptyView()
|
||||
}
|
||||
)
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ final class LibraryViewModel: ViewModel {
|
|||
self.hasPreviousPage = self.currentPage > 0
|
||||
self.hasNextPage = self.currentPage < self.totalPages - 1
|
||||
self.items = response.items ?? []
|
||||
self.calculateRows()
|
||||
self.rows = self.calculateRows()
|
||||
})
|
||||
.store(in: &cancellables)
|
||||
}
|
||||
|
@ -119,7 +119,7 @@ final class LibraryViewModel: ViewModel {
|
|||
self.hasPreviousPage = self.currentPage > 0
|
||||
self.hasNextPage = self.currentPage < self.totalPages - 1
|
||||
self.items.append(contentsOf: response.items ?? [])
|
||||
self.calculateRows()
|
||||
self.rows = self.calculateRows()
|
||||
})
|
||||
.store(in: &cancellables)
|
||||
}
|
||||
|
@ -139,21 +139,24 @@ final class LibraryViewModel: ViewModel {
|
|||
requestItems(with: filters)
|
||||
}
|
||||
|
||||
private func calculateRows() {
|
||||
private func calculateRows() -> [LibraryRow] {
|
||||
guard items.count > 0 else { return [] }
|
||||
let rowCount = items.count / columns
|
||||
rows = [LibraryRow]()
|
||||
var calculatedRows = [LibraryRow]()
|
||||
for i in (0...rowCount) {
|
||||
let firstItemIndex = i * columns
|
||||
var lastItemIndex = firstItemIndex + columns
|
||||
if lastItemIndex >= items.count {
|
||||
lastItemIndex = items.count - 1
|
||||
}
|
||||
rows.append(
|
||||
calculatedRows.append(
|
||||
LibraryRow(
|
||||
section: i,
|
||||
items: Array(items[firstItemIndex...lastItemIndex])
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
return calculatedRows
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue