Fixing suggested date for reminder - Closes #157

DamascenoRafael · Aug 15, 2023 · 3d6182c · 3d6182c
1 parent dc1c3d1
commit 3d6182c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/reminders-menubar/Extensions/Date+Extensions.swift b/reminders-menubar/Extensions/Date+Extensions.swift
@@ -23,12 +23,17 @@ extension Date {
         return Date().timeIntervalSince(self)
     }
 
-    static func nextHour(of date: Date = Date()) -> Date {
-        let now = Date()
-        let dateComponentsWithoutTime = Calendar.current.dateComponents([.year, .month, .day], from: date)
-        let dateWithoutTime = Calendar.current.date(from: dateComponentsWithoutTime)!
-        var hourComponent = Calendar.current.dateComponents([.hour], from: now)
+    static func nextExactHour(of date: Date = Date(), allowDayChange: Bool = false) -> Date {
+        let today = Date()
+        let todayNextHour = Calendar.current.date(byAdding: .hour, value: 1, to: today)!
+        let isNextHourChangingDay = !todayNextHour.isToday
+
+        var hourComponent = Calendar.current.dateComponents([.hour], from: today)
+        if allowDayChange || !isNextHourChangingDay {
         hourComponent.hour! += 1
+        }
+
+        let dateWithoutTime = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: date)!
         return Calendar.current.date(byAdding: hourComponent, to: dateWithoutTime)!
     }
 

diff --git a/reminders-menubar/Models/RmbReminder.swift b/reminders-menubar/Models/RmbReminder.swift
@@ -47,7 +47,7 @@ struct RmbReminder {
     var hasTime: Bool {
         didSet {
             // NOTE: When enabling the option to add a time the suggestion will be the next hour of the current moment
-            date = .nextHour(of: date)
+            date = .nextExactHour(of: date)
         }
     }
     var priority: EKReminderPriority
@@ -61,23 +61,23 @@ struct RmbReminder {
 
     init() {
         title = ""
-        date = .nextHour()
+        date = .nextExactHour()
         hasDueDate = false
         hasTime = false
         priority = .none
     }
 
-    init(hasDueDate: Bool, isParsingEnabled: Bool) {
+    init(isAutoSuggestingTodayForCreation: Bool) {
         self.init()
-        self.hasDueDate = hasDueDate
-        self.isParsingEnabled = isParsingEnabled
+        self.hasDueDate = isAutoSuggestingTodayForCreation
+        self.isParsingEnabled = true
     }
 
     init(reminder: EKReminder) {
         originalReminder = reminder
         title = reminder.title
         notes = reminder.notes
-        date = reminder.dueDateComponents?.date ?? .nextHour()
+        date = reminder.dueDateComponents?.date ?? .nextExactHour()
         hasDueDate = reminder.hasDueDate
         hasTime = reminder.hasTime
         priority = reminder.ekPriority
@@ -96,7 +96,7 @@ struct RmbReminder {
         guard let dateResult = DateParser.shared.getDate(from: newTitle) else {
             hasDueDate = false
             hasTime = false
-            date = .nextHour()
+            date = .nextExactHour()
             textDateResult = DateParser.TextDateResult()
             return
         }

diff --git a/reminders-menubar/Views/FormNewReminderView.swift b/reminders-menubar/Views/FormNewReminderView.swift
@@ -112,7 +112,7 @@ struct FormNewReminderView: View {
     }
 
     private func newRmbReminder(withTitle title: String = "") -> RmbReminder {
-        var rmbReminder = RmbReminder(hasDueDate: userPreferences.autoSuggestToday, isParsingEnabled: true)
+        var rmbReminder = RmbReminder(isAutoSuggestingTodayForCreation: userPreferences.autoSuggestToday)
         rmbReminder.title = title
         return rmbReminder
     }