Only schedule notifications from the phone app

And play the new ding sound!

Author: mrketchup

Core/CooldownPresenter.swift

@@ -86,7 +86,9 @@ public class CooldownPresenter {
 
     private func bumpCooldown(multipliedBy multiplier: Double) {
         State.shared.cooldown += Cooldown(created: Date(), remaining: State.shared.cooldownInterval * multiplier)
+        #if !os(watchOS)
         NotificationService.shared.scheduleNotification(for: State.shared.cooldown)
+        #endif
         refresh()
 
         if supportsWatch { WatchService.shared.stateUpdated(State.shared) }

Core/NotificationService.swift

@@ -38,12 +38,13 @@ class NotificationService: NSObject {
             let content = UNMutableNotificationContent()
             content.title = "Cooldown complete"
             content.body = "Time elapsed: \(DateComponentsFormatter.notificationFormatter.string(from: cooldown.remaining) ?? "???")"
-            content.sound = .default
-            
+            content.sound = UNNotificationSound(named: UNNotificationSoundName("ding.wav"))
+
             let components = Calendar.current.dateComponents([.year, .month, .day, .hour, .minute, .second], from: cooldown.target)
             let trigger = UNCalendarNotificationTrigger(dateMatching: components, repeats: false)
 
-            let request = UNNotificationRequest(identifier: "cooldown-complete", content: content, trigger: trigger)
+            UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
+            let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: trigger)
             UNUserNotificationCenter.current().add(request) { error in
                 if let error = error { print(error) }
             }
@@ -58,7 +59,7 @@ extension NotificationService: UNUserNotificationCenterDelegate {
         _ center: UNUserNotificationCenter,
         willPresent notification: UNNotification,
         withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
-        completionHandler(.sound)
+        completionHandler([.sound, .alert])
     }
 
 }

Core/WatchService.swift

@@ -26,8 +26,16 @@ class WatchService: NSObject {
 
     var stateChanged: (() -> Void)?
 
+    private var isConnected: Bool {
+        #if os(watchOS)
+        return true
+        #else
+        return WCSession.default.isPaired && WCSession.default.isWatchAppInstalled
+        #endif
+    }
+    
     private var canUpdateContext: Bool {
-        return WCSession.isSupported() && WCSession.default.activationState == .activated
+        return WCSession.isSupported() && WCSession.default.activationState == .activated && isConnected
     }
 
     private var canSendMessage: Bool {
@@ -90,6 +98,10 @@ extension WatchService: WCSessionDelegate {
         State.shared.cooldown = cooldown
         State.shared.cooldownInterval = interval
         DispatchQueue.main.async(execute: stateChanged ?? {})
+        
+        #if !os(watchOS)
+        NotificationService.shared.scheduleNotification(for: State.shared.cooldown)
+        #endif
     }
 
 }