Forráskód Böngészése

New 'minutes ago' computed property

Jon Mårtensson 5 éve
szülő
commit
35f1feb228

+ 2 - 3
FreeAPS/Sources/Modules/Home/View/Header/CurrentGlucoseView.swift

@@ -83,9 +83,8 @@ struct CurrentGlucoseView: View {
         let lastGlucoseDateString = recentGlucose.map { dateFormatter.string(from: $0.dateString) } ?? "--"
         let lastGlucoseDateString = recentGlucose.map { dateFormatter.string(from: $0.dateString) } ?? "--"
         let LastGlucoseDate = Date(lastGlucoseDateString) ?? Date()
         let LastGlucoseDate = Date(lastGlucoseDateString) ?? Date()
         let now = Date()
         let now = Date()
-        let diff = Int(now.timeIntervalSince1970 - LastGlucoseDate.timeIntervalSince1970)
-        let hoursDiff = diff / 3600
-        let minutesDiff = (diff - hoursDiff * 3600) / 60
+        let diffs = Calendar.current.dateComponents([.hour, .minute], from: LastGlucoseDate, to: now)
+        let minutesDiff = diffs.minute!
         return minutesDiff
         return minutesDiff
     }
     }