The inset grouped list style has a top inset that adds extra space between the navigation bar title and the list rows. Use introspect to remove this space on UITableView and UICollectionView (for iOS 16). Sections completely ignore the introspect changes, so add a section header which removes the list row insets. Signed-off-by: kingbri <bdashore3@proton.me>
151 lines
5.8 KiB
Swift
151 lines
5.8 KiB
Swift
//
|
|
// SourceListView.swift
|
|
// Ferrite
|
|
//
|
|
// Created by Brian Dashore on 7/24/22.
|
|
//
|
|
|
|
import SwiftUI
|
|
import SwiftUIX
|
|
import Introspect
|
|
|
|
struct SourcesView: View {
|
|
@Environment(\.verticalSizeClass) var verticalSizeClass: UserInterfaceSizeClass?
|
|
|
|
@EnvironmentObject var sourceManager: SourceManager
|
|
@EnvironmentObject var navModel: NavigationViewModel
|
|
|
|
let backgroundContext = PersistenceController.shared.backgroundContext
|
|
|
|
@FetchRequest(
|
|
entity: Source.entity(),
|
|
sortDescriptors: []
|
|
) var sources: FetchedResults<Source>
|
|
|
|
private var updatedSources: [SourceJson] {
|
|
var tempSources: [SourceJson] = []
|
|
|
|
for source in sources {
|
|
guard let availableSource = sourceManager.availableSources.first(where: {
|
|
source.listId == $0.listId && source.name == $0.name && source.author == $0.author
|
|
}) else {
|
|
continue
|
|
}
|
|
|
|
if availableSource.version > source.version {
|
|
tempSources.append(availableSource)
|
|
}
|
|
}
|
|
|
|
return tempSources
|
|
}
|
|
|
|
@State private var viewTask: Task<Void, Never>? = nil
|
|
@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 {
|
|
NavView {
|
|
ZStack {
|
|
if !checkedForSources {
|
|
ProgressView()
|
|
} else if sources.isEmpty && sourceManager.availableSources.isEmpty {
|
|
VStack {
|
|
Text("No Sources")
|
|
.font(.system(size: 25, weight: .semibold))
|
|
.foregroundColor(.secondaryLabel)
|
|
Text("Add a source list in Settings")
|
|
.foregroundColor(.secondaryLabel)
|
|
}
|
|
.padding(.top, verticalSizeClass == .regular ? -50 : 0)
|
|
} else {
|
|
List {
|
|
if !filteredUpdatedSources.isEmpty {
|
|
Section(header: InlineHeader("Updates")) {
|
|
ForEach(filteredUpdatedSources, id: \.self) { source in
|
|
SourceUpdateButtonView(updatedSource: source)
|
|
}
|
|
}
|
|
}
|
|
|
|
if !sources.isEmpty {
|
|
Section(header: InlineHeader("Installed")) {
|
|
ForEach(sources, id: \.self) { source in
|
|
InstalledSourceView(installedSource: source)
|
|
}
|
|
}
|
|
}
|
|
|
|
if !filteredAvailableSources.isEmpty && sourceManager.availableSources.contains(where: { availableSource in
|
|
!sources.contains(
|
|
where: {
|
|
availableSource.name == $0.name &&
|
|
availableSource.listId == $0.listId &&
|
|
availableSource.author == $0.author
|
|
}
|
|
)
|
|
}) {
|
|
Section(header: InlineHeader("Catalog")) {
|
|
ForEach(filteredAvailableSources, id: \.self) { availableSource in
|
|
if !sources.contains(
|
|
where: {
|
|
availableSource.name == $0.name &&
|
|
availableSource.listId == $0.listId &&
|
|
availableSource.author == $0.author
|
|
}
|
|
) {
|
|
SourceCatalogButtonView(availableSource: availableSource)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.conditionalId(UUID())
|
|
.listStyle(.insetGrouped)
|
|
}
|
|
}
|
|
.sheet(isPresented: $navModel.showSourceSettings) {
|
|
SourceSettingsView()
|
|
.environmentObject(navModel)
|
|
}
|
|
.onAppear {
|
|
filteredUpdatedSources = updatedSources
|
|
viewTask = Task {
|
|
await sourceManager.fetchSourcesFromUrl()
|
|
filteredAvailableSources = sourceManager.availableSources
|
|
checkedForSources = true
|
|
}
|
|
}
|
|
.onDisappear {
|
|
viewTask?.cancel()
|
|
}
|
|
.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)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
struct SourcesView_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
SourcesView()
|
|
}
|
|
}
|