Доработал вычисление дней

При разворачивании приложения пересчитываем дни для всех записей по отношении к текущей дате

Author: easydev991

SwiftUI-Days/EnvironmentKeys/CurrentDateEnvironmentKey.swift

@@ -0,0 +1,25 @@
+//
+//  CurrentDateEnvironmentKey.swift
+//  SwiftUI-Days
+//
+//  Created by Олег Еременко on 27.04.2025.
+//
+
+import SwiftUI
+
+private struct CurrentDateKey: EnvironmentKey {
+    static let defaultValue = Date.now
+}
+
+extension EnvironmentValues {
+    /// Текущая дата, нужна для вычисления количества дней
+    /// при переходе приложения в активное состояние
+    ///
+    /// Например, если свернуть приложение и открыть через пару дней,
+    /// то количество дней в списке не обновится по умолчанию, а если
+    /// считать дни по отношению к этой дате, то все будет обновляться
+    var currentDate: Date {
+        get { self[CurrentDateKey.self] }
+        set { self[CurrentDateKey.self] = newValue }
+    }
+}

SwiftUI-Days/Models/Item.swift

@@ -10,22 +10,22 @@ import SwiftData
 
 @Model
 final class Item {
-    var title: String
-    var details: String
-    var timestamp: Date
-    
-    init(title: String = "", details: String = "", timestamp: Date = .now) {
+    var title = ""
+    var details = ""
+    var timestamp = Date.now
+
+    init(title: String, details: String = "", timestamp: Date) {
         self.title = title
         self.details = details
         self.timestamp = timestamp
     }
-    
+
     /// Количество дней с момента события
-    var daysCount: Int {
+    func makeDaysCount(to date: Date) -> Int {
         Calendar.current.dateComponents(
             [.day],
             from: timestamp,
-            to: .now
+            to: date
         ).day ?? 0
     }
 

SwiftUI-Days/Screens/Main/Detail/ItemScreen.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct ItemScreen: View {
+    @Environment(\.currentDate) private var currentDate
     @State private var isEditing = false
     let item: Item
 
@@ -53,7 +54,7 @@ struct ItemScreen: View {
             Spacer()
         }
         .padding()
-        .navigationTitle("\(item.daysCount) days")
+        .navigationTitle("\(item.makeDaysCount(to: currentDate)) days")
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
                 DaysEditButton { isEditing.toggle() }

SwiftUI-Days/Screens/Main/MainScreen+ListView.swift

@@ -10,6 +10,7 @@ import SwiftData
 
 extension MainScreen {
     struct ListView: View {
+        @Environment(\.currentDate) private var currentDate
         @Environment(\.modelContext) private var modelContext
         @Binding private var editItem: Item?
         @Query private var items: [Item]
@@ -51,7 +52,8 @@ extension MainScreen {
                 Text(item.title)
                     .lineLimit(2)
                     .frame(maxWidth: .infinity, alignment: .leading)
-                Text("\(item.daysCount) days")
+                Text("\(item.makeDaysCount(to: currentDate)) days")
+                    .contentTransition(.numericText())
                     .containerRelativeFrame(.horizontal, alignment: .trailing) { length, _ in
                         length * 0.3
                     }

SwiftUI-Days/Screens/RootScreen.swift

@@ -8,8 +8,10 @@
 import SwiftUI
 
 struct RootScreen: View {
+    @Environment(\.scenePhase) private var scenePhase
     @State private var tab = Tab.list
-    
+    @State private var currentDate = Date.now
+
     var body: some View {
         TabView(selection: $tab) {
             ForEach(Tab.allCases, id: \.self) { tab in
@@ -18,6 +20,13 @@ struct RootScreen: View {
                     .tag(tab)
             }
         }
+        .environment(\.currentDate, currentDate)
+        .animation(.default, value: currentDate)
+        .onChange(of: scenePhase) { _, newPhase in
+            if newPhase == .active {
+                currentDate = .now
+            }
+        }
     }
 }
 

SwiftUI-DaysTests/SwiftUI_DaysTests.swift

@@ -25,7 +25,8 @@ struct SwiftUI_DaysTests {
     /// Тестируем `daysCount`, когда событие произошло только что
     @Test func daysCountWithNoDaysPassed() {
         let item = Item(title: "Recent Event", timestamp: .now)
-        #expect(item.daysCount == 0)
+        let result = item.makeDaysCount(to: .now)
+        #expect(result == 0)
     }
 
     /// Тестируем `daysCount` для события, произошедшего 1 день назад
@@ -34,7 +35,8 @@ struct SwiftUI_DaysTests {
             title: "One Day Ago",
             timestamp: Date(timeIntervalSinceNow: -86400)
         )
-        #expect(oneDayOldItem.daysCount == 1)
+        let result = oneDayOldItem.makeDaysCount(to: .now)
+        #expect(result == 1)
     }
 
     /// Тестируем `daysCount` для события, произошедшего 5 дней назад
@@ -43,6 +45,7 @@ struct SwiftUI_DaysTests {
             title: "Five Days Ago",
             timestamp: Date(timeIntervalSinceNow: -432000)
         )
-        #expect(fiveDaysOldItem.daysCount == 5)
+        let result = fiveDaysOldItem.makeDaysCount(to: .now)
+        #expect(result == 5)
     }
 }