Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Keep Home's greeting true to the hour whenever Home appears

Țugui Dragoșbaa3bf302ca7
diff --git a/Packages/PeelCore/Sources/PeelCore/Home/Greeting.swift b/Packages/PeelCore/Sources/PeelCore/Home/Greeting.swift
index 96b06209..c7ce5d43 100644
--- a/Packages/PeelCore/Sources/PeelCore/Home/Greeting.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Home/Greeting.swift
@@ -15,7 +15,14 @@ public enum Greeting: String, Sendable, Hashable, CaseIterable {
}
}
- /// When the greeting changes next, so a view can schedule its update.
+ /// The moments a greeting shown from `date` on is drawn again: then, and at every change after.
+ public static func changes(
+ from date: Date, calendar: Calendar = .autoupdatingCurrent
+ ) -> some Sequence<Date> {
+ sequence(first: date) { change(after: $0, calendar: calendar) }
+ }
+
+ /// When the greeting changes next.
public static func change(after date: Date, calendar: Calendar = .autoupdatingCurrent) -> Date {
let changes = startHours.compactMap {
calendar.nextDate(
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomeTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomeTests.swift
index db6311d1..b074db4a 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/HomeTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomeTests.swift
@@ -24,6 +24,12 @@ struct GreetingTests {
#expect(Greeting.at(date(0), calendar: calendar) == .evening)
}
+ @Test func listsWhenTheGreetingIsDrawnAgain() {
+ let changes = Array(Greeting.changes(from: date(11, 59), calendar: calendar).prefix(3))
+
+ #expect(changes == [date(11, 59), date(12), date(18)])
+ }
+
@Test func findsTheNextChange() {
#expect(Greeting.change(after: date(3), calendar: calendar) == date(5))
#expect(Greeting.change(after: date(5), calendar: calendar) == date(12))
diff --git a/Peel/Model/HomeModel.swift b/Peel/Model/HomeModel.swift
index 62ff3cac..2c21dc94 100644
--- a/Peel/Model/HomeModel.swift
+++ b/Peel/Model/HomeModel.swift
@@ -101,7 +101,6 @@ final class HomeModel {
private(set) var isFinderExtensionFromAnotherCopy = false
private let refreshes = OneRunAtATime()
private var isReadingModelName = false
- private(set) var greeting = Greeting.at(.now)
private var found: [Permission: State] = [:]
private(set) var notificationStatus: UNAuthorizationStatus = .notDetermined
private(set) var appManagement: AccessState = .unknown
@@ -164,7 +163,6 @@ final class HomeModel {
}
private func read() async {
- greeting = .at(.now)
// The card needs none of the checks below, so it is read first and arrives with the window.
let isFirstRead = device == nil
if isFirstRead {
@@ -229,10 +227,6 @@ final class HomeModel {
device = device?.named(name)
}
- func updateGreeting() {
- greeting = .at(.now)
- }
-
func record(appManagement state: AccessState) {
appManagementSeenThisLaunch = state
guard state != appManagement else { return }
diff --git a/Peel/Views/Home/HomeView.swift b/Peel/Views/Home/HomeView.swift
index 2eb1b3cd..7d89535c 100644
--- a/Peel/Views/Home/HomeView.swift
+++ b/Peel/Views/Home/HomeView.swift
@@ -42,14 +42,13 @@ struct HomeView: View {
}
}
}
- .task {
- while !Task.isCancelled {
- let change = Greeting.change(after: .now)
- try? await Task.sleep(until: .now + .seconds(max(1, change.timeIntervalSinceNow)), clock: .continuous)
- guard !Task.isCancelled else { return }
- home.updateGreeting()
- }
- }
+ }
+}
+
+/// Draws the greeting again at each of its changes, and as it appears, so it is never the one of an hour gone by.
+private struct GreetingChanges: TimelineSchedule {
+ func entries(from startDate: Date, mode: TimelineScheduleMode) -> some Sequence<Date> {
+ Greeting.changes(from: startDate)
}
}
@@ -60,11 +59,13 @@ struct HomeContent: View {
var body: some View {
VStack(spacing: 0) {
- Text(home.greeting.title)
- .font(.system(size: 26, weight: .bold, design: .rounded))
- .foregroundStyle(Album.ink)
- .lineLimit(1)
- .minimumScaleFactor(0.7)
+ TimelineView(GreetingChanges()) { context in
+ Text(Greeting.at(context.date).title)
+ .font(.system(size: 26, weight: .bold, design: .rounded))
+ .foregroundStyle(Album.ink)
+ .lineLimit(1)
+ .minimumScaleFactor(0.7)
+ }
if let device = home.device {
deviceCard(device).padding(.top, 38)
specs(device).padding(.top, 22)