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

Add sources page searching

Browse source 
- Fix table top inset
This commit is contained in:
Skitty 2022-09-04 14:47:04 -05:00 committed by Brian Dashore
parent f7e1b87c73
commit 4e149814a3
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Ferrite/Views/SourcesView.swift
View file

@ -42,6 +42,12 @@ struct SourcesView: View {
@State private var viewTask: Task<Void, Never>? = nil @State private var viewTask: Task<Void, Never>? = nil
@State private var checkedForSources = false @State private var checkedForSources = false
@State private var searchText: String = ""
@State private var isEditing = false
@State var filteredUpdatedSources: [SourceJson] = []
@State var filteredAvailableSources: [SourceJson] = []
var body: some View { var body: some View {
NavView { NavView {
ZStack { ZStack {
@ -58,9 +64,9 @@ struct SourcesView: View {
.padding(.top, verticalSizeClass == .regular ? -50 : 0) .padding(.top, verticalSizeClass == .regular ? -50 : 0)
} else { } else {
List { List {
if !updatedSources.isEmpty { if !filteredUpdatedSources.isEmpty {
Section(header: "Updates") { Section(header: "Updates") {
ForEach(updatedSources, id: \.self) { source in ForEach(filteredUpdatedSources, id: \.self) { source in
SourceUpdateButtonView(updatedSource: source) SourceUpdateButtonView(updatedSource: source)
} }
} }
@ -74,7 +80,7 @@ struct SourcesView: View {
} }
} }
if sourceManager.availableSources.contains(where: { availableSource in if !filteredAvailableSources.isEmpty && sourceManager.availableSources.contains(where: { availableSource in
!sources.contains( !sources.contains(
where: { where: {
availableSource.name == $0.name && availableSource.name == $0.name &&
@ -84,7 +90,7 @@ struct SourcesView: View {
) )
}) { }) {
Section(header: "Catalog") { Section(header: "Catalog") {
ForEach(sourceManager.availableSources, id: \.self) { availableSource in ForEach(filteredAvailableSources, id: \.self) { availableSource in
if !sources.contains( if !sources.contains(
where: { where: {
availableSource.name == $0.name && availableSource.name == $0.name &&
@ -106,8 +112,10 @@ struct SourcesView: View {
.environmentObject(navModel) .environmentObject(navModel)
} }
.onAppear { .onAppear {
filteredUpdatedSources = updatedSources
viewTask = Task { viewTask = Task {
await sourceManager.fetchSourcesFromUrl() await sourceManager.fetchSourcesFromUrl()
filteredAvailableSources = sourceManager.availableSources
checkedForSources = true checkedForSources = true
} }
} }
@ -115,6 +123,21 @@ struct SourcesView: View {
viewTask?.cancel() viewTask?.cancel()
} }
.navigationTitle("Sources") .navigationTitle("Sources")
.navigationSearchBar {
SearchBar("Search", text: $searchText, isEditing: $isEditing)
.showsCancelButton(isEditing)
}
.onChange(of: searchText) { newValue in
filteredAvailableSources = sourceManager.availableSources.filter { searchText.isEmpty ? true : $0.name.contains(searchText) }
filteredUpdatedSources = updatedSources.filter { searchText.isEmpty ? true : $0.name.contains(searchText) }
if #available(iOS 15.0, *) {
if searchText.isEmpty {
sources.nsPredicate = nil
} else {
sources.nsPredicate = NSPredicate(format: "name CONTAINS[cd] %@", searchText)
}
}
}
} }
} }
} }