From 5f1fdfeea61a501d9ebb7a42ed64a586f10e189c Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 27 Jan 2023 19:04:25 +0100 Subject: [PATCH] Fixes --- LeCountdown.xcodeproj/project.pbxproj | 6 ++++++ LeCountdown/CountdownScheduler.swift | 2 +- LeCountdown/Model/Persistence.swift | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/LeCountdown.xcodeproj/project.pbxproj b/LeCountdown.xcodeproj/project.pbxproj index ca2ee0c..e589795 100644 --- a/LeCountdown.xcodeproj/project.pbxproj +++ b/LeCountdown.xcodeproj/project.pbxproj @@ -51,6 +51,9 @@ C438C8182982BFC100BF3EF9 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4060DC8297AE73D003FAB80 /* Persistence.swift */; }; C438C8192982BFDB00BF3EF9 /* NSManagedContext+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C438C7C4298024E900BF3EF9 /* NSManagedContext+Extensions.swift */; }; C438C81A2982BFF100BF3EF9 /* NSManagedContext+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C438C7C4298024E900BF3EF9 /* NSManagedContext+Extensions.swift */; }; + C445FA86298448720054D761 /* Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5629840F6400D5D950 /* Media.swift */; }; + C445FA87298448730054D761 /* Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5629840F6400D5D950 /* Media.swift */; }; + C445FA882984487F0054D761 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C4060DC3297AE73D003FAB80 /* Assets.xcassets */; }; C4742B5729840F6400D5D950 /* Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5629840F6400D5D950 /* Media.swift */; }; C4742B59298411E800D5D950 /* CountdownFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B58298411E800D5D950 /* CountdownFormView.swift */; }; C4742B5B298414B000D5D950 /* ImageSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4742B5A298414B000D5D950 /* ImageSelectionView.swift */; }; @@ -509,6 +512,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C445FA882984487F0054D761 /* Assets.xcassets in Resources */, C438C7DD2981216300BF3EF9 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -572,6 +576,7 @@ files = ( C438C7EB2981266F00BF3EF9 /* SingleCountdownView.swift in Sources */, C438C7D62981216200BF3EF9 /* LaunchWidgetBundle.swift in Sources */, + C445FA87298448730054D761 /* Media.swift in Sources */, C438C8172982BE9C00BF3EF9 /* Model+Extensions.swift in Sources */, C438C8162982BE1E00BF3EF9 /* LeCountdown.xcdatamodeld in Sources */, C438C8152982BD9000BF3EF9 /* IntentDataProvider.swift in Sources */, @@ -594,6 +599,7 @@ C438C81A2982BFF100BF3EF9 /* NSManagedContext+Extensions.swift in Sources */, C438C8012981327600BF3EF9 /* Persistence.swift in Sources */, C438C7FD29812BF700BF3EF9 /* LaunchWidget.intentdefinition in Sources */, + C445FA86298448720054D761 /* Media.swift in Sources */, C438C800298130E900BF3EF9 /* IntentDataProvider.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LeCountdown/CountdownScheduler.swift b/LeCountdown/CountdownScheduler.swift index 6ad0cab..b35ddf1 100644 --- a/LeCountdown/CountdownScheduler.swift +++ b/LeCountdown/CountdownScheduler.swift @@ -19,7 +19,7 @@ class CountdownScheduler { func cancelCurrentNotifications(countdown: Countdown) { UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: [countdown.stringId]) - AppEnvironment.sun.endCountdown(countdownId: countdown.stringId, cancel: false) + AppEnvironment.sun.endCountdown(countdownId: countdown.stringId, cancel: true) } fileprivate func _scheduleCountdownNotification(countdown: Countdown, handler: @escaping (Result) -> Void) { diff --git a/LeCountdown/Model/Persistence.swift b/LeCountdown/Model/Persistence.swift index ea55531..0bdef58 100644 --- a/LeCountdown/Model/Persistence.swift +++ b/LeCountdown/Model/Persistence.swift @@ -21,6 +21,7 @@ struct PersistenceController { let countdown = Countdown(context: viewContext) countdown.order = Int16(i) countdown.activity = activity + countdown.image = CoolPic.pic1.rawValue } for i in 0..<3 {