Skip to content

feat: close the page automatically after exporting the calendar #588

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
Caster-L wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: close the page automatically after exporting the calendar #588

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
2 changes: 1 addition & 1 deletion Fudan Kit/Course/UndergraduateCourseAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public enum UndergraduateCourseAPI {
let courses = builders.map { $0.build() }

for course in courses {
if courses.contains(where: { $0.code == course.code && $0.conflicts(with: course) }) {
if courses.contains(where: { $0.id != course.id && $0.code == course.code && $0.conflicts(with: course) }) {
coursesToSplit.insert(course.code)
}
}
Expand Down
21 changes: 15 additions & 6 deletions FudanUI/Pages/CoursePage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ fileprivate struct ExportSheet: View {

private func presentCalendarChooser() async throws {
let eventStore = EKEventStore()
selectedCalendar = nil

if #available(iOS 17, *) {
let granted = try await eventStore.requestWriteOnlyAccessToEvents()
Expand Down Expand Up @@ -543,14 +544,14 @@ fileprivate struct ExportSheet: View {
} message: {
Text(verbatim: exportError?.localizedDescription ?? "")
}
.sheet(isPresented: $showCalendarChooser) {
.sheet(isPresented: $showCalendarChooser, onDismiss: {
if let selectedCalendar {
exportToCalendar(calendar: selectedCalendar)
self.selectedCalendar = nil
}
}) {
CalendarChooserSheet(selectedCalendar: $selectedCalendar, eventStore: eventStore)
.ignoresSafeArea()
.onDisappear {
if let selectedCalendar = selectedCalendar {
exportToCalendar(calendar: selectedCalendar)
}
}
}
}
}
Expand Down Expand Up @@ -579,11 +580,19 @@ fileprivate struct CalendarChooserSheet: UIViewControllerRepresentable {

class Coordinator: NSObject, UINavigationControllerDelegate, EKCalendarChooserDelegate {
let parent: CalendarChooserSheet
private var hasHandledSelection = false

init(_ parent: CalendarChooserSheet) {
self.parent = parent
}

func calendarChooserSelectionDidChange(_ calendarChooser: EKCalendarChooser) {
guard !hasHandledSelection, let calendar = calendarChooser.selectedCalendars.first else { return }
hasHandledSelection = true
parent.selectedCalendar = calendar
parent.dismiss()
}

func calendarChooserDidFinish(_ calendarChooser: EKCalendarChooser) {
if let calendar = calendarChooser.selectedCalendars.first {
parent.selectedCalendar = calendar
Expand Down