Commit `3a3dedba06`

3a3dedba062790e1580c66d38606eda4b02cb501

parent: 29fd24ba30

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-09 05:35 UTC

Agenda: move the now line each minute

Both apps redraw on each minute boundary and refresh when the day changes, so the now line and today's statuses stay current. The Mac no longer rereads the agenda files every minute.

Layout: unified · split

Sources/Orgstar/AgendaView.swift +11 −7

     /// The selected line: `day:index` (`day:o` + index in the overdue group), or `list:index`.
     @State private var selection: String?
     @State private var tick = 0
+    /// The time the now line shows, kept to the minute while the agenda is open.
+    @State private var now = Date()
     /// The view picker moved to the agenda for a followed timestamp, which sets its own days.
     @State private var keepRequestedDays = false
     @State private var message: String?
         }
         .task {
             loadViews()
-            // The time grid's "now" line and the day itself move on.
+            // The now line moves each minute; a new day refreshes the statuses.
             while !Task.isCancelled {
-                try? await Task.sleep(for: .seconds(60))
+                let next = Calendar.current.nextDate(after: Date(), matching: DateComponents(second: 0), matchingPolicy: .nextTime) ?? Date().addingTimeInterval(60)
-                tick += 1
+                try? await Task.sleep(for: .seconds(next.timeIntervalSinceNow))
+                now = Date()
+                if Days.absolute(now, calendar: .current) != agenda.today { tick += 1 }
             }
         }
     }
                 .padding(.horizontal, 16)
                 .padding(.vertical, 10)
         }
-        let now = group.nowIndex(now: Self.hhmm(Date()))
+        let nowAt = group.nowIndex(now: Self.hhmm(now))
         ForEach(Array(group.rows.enumerated()), id: \.element.id) { index, row in
-            if index == now { nowLine }
+            if index == nowAt { nowLine }
             rowView(Line(id: "\(group.day):\(index)", row: row, day: group.day))
         }
-        if let now, now == group.rows.count { nowLine }
+        if let nowAt, nowAt == group.rows.count { nowLine }
     }
     private func header(@ViewBuilder _ content: () -> some View) -> some View {
     private var nowLine: some View {
         HStack(spacing: 6) {
-            Text(Date().formatted(.dateTime.hour(.twoDigits(amPM: .omitted)).minute()))
+            Text(now.formatted(.dateTime.hour(.twoDigits(amPM: .omitted)).minute()))
                 .font(.system(size: 10, weight: .semibold).monospacedDigit())
                 .frame(width: AgendaRowView.gutterWidth, alignment: .leading)
             Circle().frame(width: 6, height: 6)

Sources/OrgstarMobile/AgendaScreen.swift +17 −5

     @Environment(MobileModel.self) private var model
     @Environment(\.colorScheme) private var colorScheme
     @State private var tick = 0
+    /// The time the now line shows, kept to the minute while the agenda is open.
+    @State private var now = Date()
     @State private var views = AgendaViewLoader.builtIn
     @State private var viewName = "Agenda"
     @State private var filter = AgendaFilter()
             views = loaded.views
             if let problem = loaded.problems.first { message = problem }
         }
+        // The now line moves each minute; a new day refreshes the statuses.
+        .task {
+            while !Task.isCancelled {
+                let next = Calendar.current.nextDate(after: Date(), matching: DateComponents(second: 0), matchingPolicy: .nextTime) ?? Date().addingTimeInterval(60)
+                try? await Task.sleep(for: .seconds(next.timeIntervalSinceNow))
+                now = Date()
+                if Days.absolute(now, calendar: .current) != agenda.today { tick += 1 }
+            }
+        }
         // Calendar access is asked for when calendar-events is turned on.
         .task(id: model.settingsVersion) {
             guard OrgPreferences.calendarEvents(), !CalendarEvents.isAuthorized else { return }
             if group.isEmpty {
                 Text("Nothing scheduled").font(.subheadline).foregroundStyle(.secondary)
             }
-            let now = nowIndex(group)
+            let nowAt = nowIndex(group)
             ForEach(Array(group.rows.enumerated()), id: \.element.id) { index, item in
-                if index == now { NowLine(color: todayColor) }
+                if index == nowAt { NowLine(time: now, color: todayColor) }
                 row(item, day: group.day)
             }
-            if let now, now == group.rows.count { NowLine(color: todayColor) }
+            if let nowAt, nowAt == group.rows.count { NowLine(time: now, color: todayColor) }
         }
     }
     private func nowIndex(_ group: AgendaDayGroup) -> Int? {
-        let c = Calendar.current.dateComponents([.hour, .minute], from: Date())
+        let c = Calendar.current.dateComponents([.hour, .minute], from: now)
         return group.nowIndex(now: (c.hour ?? 0) * 100 + (c.minute ?? 0))
     }
 /// The current time between timed rows, as Org's `now - - -` line.
 struct NowLine: View {
+    let time: Date
     let color: Color
     var body: some View {
         HStack(spacing: 6) {
-            Text(Date.now.formatted(date: .omitted, time: .shortened))
+            Text(time.formatted(date: .omitted, time: .shortened))
                 .font(.caption2.weight(.semibold).monospacedDigit())
                 .foregroundStyle(color)
             Circle().fill(color).frame(width: 6, height: 6)

Commit 3a3dedba06

Commit `3a3dedba06`