收藏筛选

Author: ming1016

SwiftPamphletApp/InfoOrganizer/Info/InfoListView.swift

@@ -17,9 +17,10 @@ struct InfoListView: View {
     @Query(sort: [SortDescriptor(\IOCategory.updateDate, order: .reverse)]) var cates: [IOCategory]
     @State private var filterCate = ""
     @State var limit: Int = 100
+    @State var filterStar: Bool = false
 
     var body: some View {
-        InfosView(filterCateName: filterCate, searchString: searchText, selectInfo: $selectInfo, sortOrder: sortOrder, limit: $limit)
+        InfosView(filterCateName: filterCate, searchString: searchText, filterStar: filterStar, selectInfo: $selectInfo, sortOrder: sortOrder, limit: $limit)
             .navigationTitle("资料列表")
             .toolbar {
                 ToolbarItem(placement: .navigation) {
@@ -36,6 +37,12 @@ struct InfoListView: View {
                         }
                     }
                 }
+                ToolbarItem(placement: .navigation) {
+                    Toggle(isOn: $filterStar) {
+                        Image(systemName: filterStar ? "star.fill" : "star")
+                    }
+                    .toggleStyle(.button)
+                }
                 ToolbarItem(placement: .navigation) {
                     Menu("Sort", systemImage: "arrow.up.arrow.down.square") {
                         Picker("排序", selection: $sortOrder) {

SwiftPamphletApp/InfoOrganizer/Info/InfosView.swift

@@ -14,16 +14,16 @@ struct InfosView: View {
     @Binding var selectInfo: IOInfo?
     @Binding var limit: Int
 
-    init(filterCateName: String = "", searchString: String = "", selectInfo: Binding<IOInfo?>, sortOrder: [SortDescriptor<IOInfo>] = [], limit: Binding<Int>) {
+    init(filterCateName: String = "", searchString: String = "", filterStar: Bool = false ,selectInfo: Binding<IOInfo?>, sortOrder: [SortDescriptor<IOInfo>] = [], limit: Binding<Int>) {
         var fd = FetchDescriptor<IOInfo>(predicate: #Predicate { info in
             if !filterCateName.isEmpty && !searchString.isEmpty {
                 (info.name.localizedStandardContains(searchString)
                 || info.url.localizedStandardContains(searchString)
-                 || info.des.localizedStandardContains(searchString)) && info.category?.name == filterCateName
+                 || info.des.localizedStandardContains(searchString)) && info.category?.name == filterCateName && info.star == filterStar
             } else if !filterCateName.isEmpty {
-                info.category?.name == filterCateName
+                info.category?.name == filterCateName && info.star == filterStar
             } else if searchString.isEmpty {
-                true
+                info.star == filterStar
             } else {
                 info.name.localizedStandardContains(searchString)
                 || info.url.localizedStandardContains(searchString)