Creepso/Ferrite-backup
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 15 Packages Wiki Activity Actions

FetchRequest: Add descriptors

Browse source 
Adding the ability to send sort descriptors adds more flexibility
for the DynamicFetchRequest backport. Use this to fix bookmarks sorting.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2023-01-08 14:02:19 -05:00
parent 6456b34210
commit e31f9a07fe
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ferrite/Views/CommonViews/DynamicFetchRequest.swift
View file

@ -21,9 +21,10 @@ struct DynamicFetchRequest<T: NSManagedObject, Content: View>: View {
} }
init(predicate: NSPredicate?, init(predicate: NSPredicate?,
sortDescriptors: [NSSortDescriptor] = [],
@ViewBuilder content: @escaping (FetchedResults<T>) -> Content) @ViewBuilder content: @escaping (FetchedResults<T>) -> Content)
{ {
_fetchRequest = FetchRequest<T>(sortDescriptors: [], predicate: predicate) _fetchRequest = FetchRequest<T>(sortDescriptors: sortDescriptors, predicate: predicate)
self.content = content self.content = content
} }
} }

5
Ferrite/Views/ComponentViews/Library/BookmarksView.swift
View file

@ -21,7 +21,10 @@ struct BookmarksView: View {
@State private var bookmarkPredicate: NSPredicate? @State private var bookmarkPredicate: NSPredicate?
var body: some View { var body: some View {
DynamicFetchRequest(predicate: bookmarkPredicate) { (bookmarks: FetchedResults<Bookmark>) in DynamicFetchRequest(
predicate: bookmarkPredicate,
sortDescriptors: [NSSortDescriptor(keyPath: \Bookmark.orderNum, ascending: true)]
) { (bookmarks: FetchedResults<Bookmark>) in
List { List {
if !bookmarks.isEmpty { if !bookmarks.isEmpty {
ForEach(bookmarks, id: \.self) { bookmark in ForEach(bookmarks, id: \.self) { bookmark in