Skip to content

Commit da61747

Browse files
authored
Merge pull request #20 from loopandlearn/future-carbs-update
Update future carbs for new carb entry code
2 parents 6a54ad0 + f561b71 commit da61747

File tree

1 file changed

+31
-0
lines changed

1 file changed

+31
-0
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Submodule Loop contains modified content
2+
diff --git a/Loop/Loop/Models/LoopConstants.swift b/Loop/Loop/Models/LoopConstants.swift
3+
index a62fc138..795c5a6e 100644
4+
--- a/Loop/Loop/Models/LoopConstants.swift
5+
+++ b/Loop/Loop/Models/LoopConstants.swift
6+
@@ -25,7 +25,7 @@ enum LoopConstants {
7+
static let maxCarbAbsorptionTime = TimeInterval(hours: 8)
8+
9+
static let maxCarbEntryPastTime = TimeInterval(hours: (-12))
10+
- static let maxCarbEntryFutureTime = TimeInterval(hours: 1)
11+
+ static let maxCarbEntryFutureTime = TimeInterval(hours: 4)
12+
13+
static let maxOverrideDurationTime = TimeInterval(hours: 24)
14+
15+
diff --git a/Loop/Loop/View Models/CarbEntryViewModel.swift b/Loop/Loop/View Models/CarbEntryViewModel.swift
16+
index d04ddba7..562bb61e 100644
17+
--- a/Loop/Loop/View Models/CarbEntryViewModel.swift
18+
+++ b/Loop/Loop/View Models/CarbEntryViewModel.swift
19+
@@ -59,10 +59,10 @@ final class CarbEntryViewModel: ObservableObject {
20+
@Published var time = Date()
21+
private var date = Date()
22+
var minimumDate: Date {
23+
- get { date.addingTimeInterval(.hours(-12)) }
24+
+ get { date.addingTimeInterval(LoopConstants.maxCarbEntryPastTime) }
25+
}
26+
var maximumDate: Date {
27+
- get { date.addingTimeInterval(.hours(1)) }
28+
+ get { date.addingTimeInterval(LoopConstants.maxCarbEntryFutureTime) }
29+
}
30+
31+
@Published var foodType = ""

0 commit comments

Comments
 (0)