Send alarm notification only if user entered sleep mode

VladimirBrejcha · Aug 26, 2023 · 326ac72 · 326ac72
1 parent 12c3716
commit 326ac72
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/Core/Sources/Core/NotificationManager.swift b/Core/Sources/Core/NotificationManager.swift
@@ -87,4 +87,8 @@ public final class NotificationManager: NSObject {
     public func cleanDelivered() {
         center.removeAllDeliveredNotifications()
     }
+
+    public func removeNotification(by id: String) {
+        center.removePendingNotificationRequests(withIdentifiers: [id])
+    }
 }
diff --git a/DomainLayer/Sources/DomainLayer/UseCases/ScheduleSleepNotifications.swift b/DomainLayer/Sources/DomainLayer/UseCases/ScheduleSleepNotifications.swift
@@ -11,6 +11,8 @@ public protocol HasScheduleSleepNotifications {
 
 public protocol ScheduleSleepNotifications: AnyObject {
     func callAsFunction()
+    func setAlarmNotification(time: Date)
+    func cancelAlarmNotification()
 }
 
 class ScheduleSleepNotificationsImpl:
@@ -56,15 +58,15 @@ class ScheduleSleepNotificationsImpl:
         )
     }
 
-    func generateWakeUpNotification(for date: Date, index: Int) {
+    func generateWakeUpNotification(for date: Date, id: String) {
         let wakeUpComponents = Calendar.current.dateComponents([.year, .month, .day, .hour, .minute, .second], from: date)
         let wakeUpTitle = NotificationText.textTitleWakeUp.randomElement() ?? "🌞 Rise and Shine: A New Day Beckons!"
         let wakeUpBody = NotificationText.textBodyWakeUp.randomElement() ?? "☀️ Good morning! It's a brand-new day filled with possibilities. Time to rise and shine, and make the most of it!"
         notificationManager.createNotification(
             title: wakeUpTitle,
             body: wakeUpBody,
             components: wakeUpComponents,
-            identifier: "time-to-wake-\(index)"
+            identifier: id
         )
     }
 
@@ -73,9 +75,18 @@ class ScheduleSleepNotificationsImpl:
             .forNextDays(numberOfDays: 10, startToday: true)
         for (i, day) in schedule.enumerated() {
             generateSleepNotification(for: day.toBed, index: i)
-            generateWakeUpNotification(for: day.wakeUp, index: i)
         }
     }
+
+    private let wakeNotificationId = "time-to-wake"
+
+    func setAlarmNotification(time: Date) {
+        generateWakeUpNotification(for: time, id: wakeNotificationId)
+    }
+
+    func cancelAlarmNotification() {
+        notificationManager.removeNotification(by: wakeNotificationId)
+    }
 }
 
     public struct NotificationText {

diff --git a/Rise.xcodeproj/project.pbxproj b/Rise.xcodeproj/project.pbxproj
@@ -1038,7 +1038,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.vladimirkorolev.rise;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1065,7 +1065,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.vladimirkorolev.rise;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Rise/Presentation/Pages/Sleep/SleepViewController.swift b/Rise/Presentation/Pages/Sleep/SleepViewController.swift
@@ -28,6 +28,7 @@ final class SleepViewController:
     & HasChangeScreenBrightness
     & HasPlayWhileSleepingMelody
     & HasPlayBeforeAlarmMelody
+    & HasScheduleSleepNotifications
 
     typealias Params = Date
     typealias View = SleepView
@@ -103,6 +104,7 @@ final class SleepViewController:
         super.init(nibName: nil, bundle: nil)
         deps.preventAppSleep(true)
         deps.manageActiveSleep.alarmAt = alarmTime
+        deps.scheduleSleepNotifications.setAlarmNotification(time: alarmTime)
     }
 
     @available(*, unavailable)
@@ -123,7 +125,7 @@ final class SleepViewController:
                 Date().HHmmString
             },
             wakeUpInDataSource: { [weak self] in
-                if let timeLeft = self?.alarmTime.fixIfNeeded().timeIntervalSince(Date()).HHmmString {
+                if let timeLeft = self?.alarmTime.fixIfNeeded().timeIntervalSince(Date.now).HHmmString {
                     return FloatingLabel.Model(text: "Wake up in \(timeLeft)", alpha: 1)
                 } else {
                     return FloatingLabel.Model(text: "", alpha: 0)
@@ -134,6 +136,7 @@ final class SleepViewController:
                 self?.restoreBrightness()
                 self?.playWhileSleepingMelody.stop()
                 self?.playBeforeAlarmMelody.stop()
+                self?.deps.scheduleSleepNotifications.cancelAlarmNotification()
                 self?.out(.showAfterSleep)
             },
             keepAppOpenedHandler: { [weak self] in