فهرست منبع

fix for snooze

Jonas Björkert 3 سال پیش
والد
کامیت
665e0651c5
2فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 1 1
      LoopFollow/Controllers/Alarms.swift
  2. 4 3
      LoopFollow/ViewControllers/SnoozeViewController.swift

+ 1 - 1
LoopFollow/Controllers/Alarms.swift

@@ -496,7 +496,7 @@ extension MainViewController {
             }
         }
         
-        if UserDefaultsRepository.alertBatteryActive.value {
+        if UserDefaultsRepository.alertBatteryActive.value && !UserDefaultsRepository.alertBatteryIsSnoozed.value {
             let currentBatteryLevel = UserDefaultsRepository.deviceBatteryLevel.value
             let alertAtBatteryLevel = Double(UserDefaultsRepository.alertBatteryLevel.value)
             

+ 4 - 3
LoopFollow/ViewControllers/SnoozeViewController.swift

@@ -215,12 +215,13 @@ class SnoozeViewController: UIViewController, UNUserNotificationCenterDelegate {
         guard let alarms = self.tabBarController!.viewControllers?[1] as? AlarmViewController else { return }
         alarms.reloadIsSnoozed(key: "alertCOBIsSnoozed", value: true)
         alarms.reloadSnoozeTime(key: "alertCOBSnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(snoozeForMinuteStepper.value * 60 * 60)))
-       } else if AlarmSound.whichAlarm == "Battery Alarm" {
+       } else if AlarmSound.whichAlarm == "Low Battery" {
            UserDefaultsRepository.alertBatteryIsSnoozed.value = true
-           UserDefaultsRepository.alertBatterySnoozedTime.value = Date().addingTimeInterval(TimeInterval(snoozeForMinuteStepper.value * 60))
+
+           UserDefaultsRepository.alertBatterySnoozedTime.value = Date().addingTimeInterval(TimeInterval(snoozeForMinuteStepper.value * 60 * 60))
            guard let alarms = self.tabBarController!.viewControllers?[1] as? AlarmViewController else { return }
            alarms.reloadIsSnoozed(key: "alertBatteryIsSnoozed", value: true)
-           alarms.reloadSnoozeTime(key: "alertBatterySnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(snoozeForMinuteStepper.value * 60)))
+           alarms.reloadSnoozeTime(key: "alertBatterySnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(snoozeForMinuteStepper.value * 60 * 60)))
        }
     }