Skip to content

Rework list #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SMillerDev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rework list #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions Fosdem.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
926414702D4650CA001378EF /* Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9264146F2D4650C8001378EF /* Array.swift */; };
926414722D46BEE9001378EF /* EventList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926414712D46BEE9001378EF /* EventList.swift */; };
9268D79A298F251E0067A6B1 /* ListSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9268D799298F251E0067A6B1 /* ListSettings.swift */; };
92775AC22CFF7FEB00D44236 /* SectionedQuery in Frameworks */ = {isa = PBXBuildFile; productRef = 92775AC12CFF7FEB00D44236 /* SectionedQuery */; };
92775AC52CFF880500D44236 /* BookmarkList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92775AC42CFF87FD00D44236 /* BookmarkList.swift */; };
9290384C2C9613FD002201FC /* ScheduleFetchingActor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9290384B2C9613F6002201FC /* ScheduleFetchingActor.swift */; };
92B987FC2981CD10007574EB /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B987FB2981CD10007574EB /* AboutView.swift */; };
Expand All @@ -48,6 +47,7 @@
92CE31B128FC4A940073813E /* EventListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92CE31B028FC4A940073813E /* EventListView.swift */; };
92D9E7B8291D7B9B007D203D /* HTMLFormattedText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92D9E7B7291D7B9B007D203D /* HTMLFormattedText.swift */; };
92D9E7BA291D95E1007D203D /* EventDetailHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92D9E7B9291D95E1007D203D /* EventDetailHeader.swift */; };
92EF5F422D47D8B50050C67D /* SectionedQuery in Frameworks */ = {isa = PBXBuildFile; productRef = 92EF5F412D47D8B50050C67D /* SectionedQuery */; };
92F70AA02922B49A000BE6CB /* UrlHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92F70A9F2922B49A000BE6CB /* UrlHelper.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -124,7 +124,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
92775AC22CFF7FEB00D44236 /* SectionedQuery in Frameworks */,
92EF5F422D47D8B50050C67D /* SectionedQuery in Frameworks */,
9203845F2B5B0A2100B793AA /* PentabarfKit in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -287,12 +287,13 @@
buildRules = (
);
dependencies = (
92E5C1112D4817250017CEE0 /* PBXTargetDependency */,
92FC930A2B5C2DA100C2D13D /* PBXTargetDependency */,
);
name = Fosdem;
packageProductDependencies = (
9203845E2B5B0A2100B793AA /* PentabarfKit */,
92775AC12CFF7FEB00D44236 /* SectionedQuery */,
92EF5F412D47D8B50050C67D /* SectionedQuery */,
);
productName = Fosdem;
productReference = 14D277152205D07200740042 /* Fosdem.app */;
Expand Down Expand Up @@ -373,7 +374,7 @@
mainGroup = 14D2770C2205D07200740042;
packageReferences = (
9203845D2B5B0A2100B793AA /* XCRemoteSwiftPackageReference "PentabarfKit" */,
92775AC02CFF7F1F00D44236 /* XCRemoteSwiftPackageReference "swiftdata-sectionedquery" */,
92EF5F402D47D8B50050C67D /* XCRemoteSwiftPackageReference "swiftdata-sectionedquery" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = 14D277162205D07200740042 /* Products */;
Expand Down Expand Up @@ -508,6 +509,10 @@
target = 14D277142205D07200740042 /* Fosdem */;
targetProxy = 14D2773A2205D07500740042 /* PBXContainerItemProxy */;
};
92E5C1112D4817250017CEE0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 92E5C1102D4817250017CEE0 /* SectionedQuery */;
};
92FC930A2B5C2DA100C2D13D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 92FC93092B5C2DA100C2D13D /* PentabarfKit */;
Expand Down Expand Up @@ -844,12 +849,12 @@
kind = branch;
};
};
92775AC02CFF7F1F00D44236 /* XCRemoteSwiftPackageReference "swiftdata-sectionedquery" */ = {
92EF5F402D47D8B50050C67D /* XCRemoteSwiftPackageReference "swiftdata-sectionedquery" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/beechtom/swiftdata-sectionedquery";
repositoryURL = "https://github.com/Whiffer/swiftdata-sectionedquery";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.2.0;
minimumVersion = 1.0.3;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand All @@ -860,9 +865,14 @@
package = 9203845D2B5B0A2100B793AA /* XCRemoteSwiftPackageReference "PentabarfKit" */;
productName = PentabarfKit;
};
92775AC12CFF7FEB00D44236 /* SectionedQuery */ = {
92E5C1102D4817250017CEE0 /* SectionedQuery */ = {
isa = XCSwiftPackageProductDependency;
package = 92EF5F402D47D8B50050C67D /* XCRemoteSwiftPackageReference "swiftdata-sectionedquery" */;
productName = SectionedQuery;
};
92EF5F412D47D8B50050C67D /* SectionedQuery */ = {
isa = XCSwiftPackageProductDependency;
package = 92775AC02CFF7F1F00D44236 /* XCRemoteSwiftPackageReference "swiftdata-sectionedquery" */;
package = 92EF5F402D47D8B50050C67D /* XCRemoteSwiftPackageReference "swiftdata-sectionedquery" */;
productName = SectionedQuery;
};
92FC93092B5C2DA100C2D13D /* PentabarfKit */ = {
Expand Down
44 changes: 26 additions & 18 deletions Fosdem/Views/Lists/EventList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,44 @@ import SwiftUI
import SectionedQuery

struct EventList: View {
@SectionedQuery private var events: SectionedResults<String, Event>
@SectionedQuery private var sections: SectionedResults<String, Event>

let terms: ListSettings
private let terms: ListSettings

init(_ type: ListPredicateType, terms: ListSettings) {
self.terms = terms

let key = switch type {
case .room:
\Event.roomName
\Event.room.name
case .person:
\Event.authorName
\Event.authors.first!.name
case .track:
\Event.trackName
\Event.track!.name
}
self.terms = terms
_events = SectionedQuery(key,
filter: terms.predicate(type),
sort: [SortDescriptor(\.start, order: .forward)])

_sections = SectionedQuery(sectionIdentifier: key,
sortDescriptors: [
SortDescriptor(key, order: .forward),
SortDescriptor(\Event.start, order: .forward)
],
predicate: terms.predicate(type))
}

var body: some View {
List(events, id: \.id) { section in
Section(header: Text("\(section.id)")) {
ForEach(section, id: \.id) { event in
NavigationLink(value: event,
label: {
ListItem(event, bookmarkEmphasis: !terms.onlyBookmarks).id(event.id)
})
List {
ForEach(sections) { section in
Section(header: Text(section.id)) {
ForEach(section, id: \.id) { event in
NavigationLink(value: event,
label: {
ListItem(event, bookmarkEmphasis: !terms.onlyBookmarks)
.id(event.id)
})
}
}
}
}.overlay(ListStatusOverlay(empty: events.isEmpty, terms: terms))
.listStyle(.plain)
}.overlay(ListStatusOverlay(empty: sections.isEmpty, terms: terms))
.listStyle(.plain)
}
}
23 changes: 13 additions & 10 deletions Fosdem/Views/Lists/EventListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ struct EventListView: View {
@State private var query = ""
@State private var isSheetPresented: Bool = false
@State private var isSearchPresented: Bool = false
@State private var selectedEvent: Event?

@State private var onlyBookmarks: Bool
@State private var onlyFuture: Bool
@State private var list: ListPredicateType = .track
@State private var listType: ListPredicateType = .track

@StateObject private var predicate = ListSettings()

Expand All @@ -29,25 +30,27 @@ struct EventListView: View {
self.onlyFuture = UserDefaults.standard.bool(forKey: "onlyFuture")
}

var eventList: EventList {
EventList(listType, terms: predicate)
}

var body: some View {
NavigationStack {
EventList(self.list, terms: predicate)
self.eventList
.onChange(of: query) { value, _ in
predicate.query = value
}.onChange(of: isSearchPresented) { _, value in
if value { return }
predicate.query = nil
}.searchable(text: $query, isPresented: $isSearchPresented)
}
.searchable(text: $query, isPresented: $isSearchPresented)
.navigationDestination(for: Event.self, destination: { event in
EventDetailView(event)
}).toolbar {
ToolbarTitleMenu {
ForEach(ListPredicateType.all, id: \.self) { type in
Button {
self.list = type
} label: {
Picker("List grouping", selection: $listType) {
ForEach(ListPredicateType.all, id: \.self) { type in
Label(ListPredicateType.getName(type), systemImage: ListPredicateType.getIcon(type))
.foregroundStyle(self.list == type ? .primary : .secondary)
}
}
}
Expand Down Expand Up @@ -85,9 +88,9 @@ struct EventListView: View {
SettingsView(localTime: predicate.localTime, year: predicate.year)
.presentationDetents([.medium])
})
.navigationTitle(ListPredicateType.getName(list))
.navigationTitle(ListPredicateType.getName(listType))
.toolbarTitleDisplayMode(.inline)
.refreshable {
.refreshable {
Task {
await RoomStatusFetcher.fetchRoomStatus()
await RemoteScheduleFetcher.fetchSchedule()
Expand Down
Loading