Skip to content

Commit 7333fa3

Browse files
Camji55Camji55
committed
[LOOP-4870] LoopCircleView Updates
1 parent 1433ae1 commit 7333fa3

12 files changed

+75
-131
lines changed

‎Loop Widget Extension/Components/LoopCircleEntryView.swift

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//
2+
// LoopCircleEntryView.swift
3+
// Loop
4+
//
5+
// Created by Noah Brauner on 8/15/22.
6+
// Copyright © 2022 LoopKit Authors. All rights reserved.
7+
//
8+
9+
import LoopKit
10+
import LoopKitUI
11+
import SwiftUI
12+
13+
struct LoopCircleEntryView: View {
14+
var entry: StatusWidgetTimelimeEntry
15+
16+
var body: some View {
17+
let closedLoop = entry.closeLoop
18+
let lastLoopCompleted = entry.lastLoopCompleted ?? Date().addingTimeInterval(.minutes(16))
19+
let age = abs(min(0, lastLoopCompleted.timeIntervalSinceNow))
20+
let freshness = LoopCompletionFreshness(age: age)
21+
22+
LoopCircleView(closedLoop: closedLoop, freshness: freshness)
23+
.disabled(entry.contextIsStale)
24+
}
25+
}

‎Loop Widget Extension/Components/LoopCircleView.swift

-40
This file was deleted.

‎Loop Widget Extension/Widgets/SystemStatusWidget.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct SystemStatusWidgetEntryView : View {
2020
HStack(alignment: .center, spacing: 5) {
2121
VStack(alignment: .center, spacing: 5) {
2222
HStack(alignment: .center, spacing: 15) {
23-
LoopCircleView(entry: entry)
23+
LoopCircleEntryView(entry: entry)
2424

2525
GlucoseView(entry: entry)
2626
}

‎Loop.xcodeproj/project.pbxproj

+6-10
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
14B1737228AEDBF6006CCD7C /* BasalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B1736E28AEDBF6006CCD7C /* BasalView.swift */; };
2929
14B1737328AEDBF6006CCD7C /* SystemStatusWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B1736F28AEDBF6006CCD7C /* SystemStatusWidget.swift */; };
3030
14B1737428AEDBF6006CCD7C /* GlucoseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B1737028AEDBF6006CCD7C /* GlucoseView.swift */; };
31-
14B1737528AEDBF6006CCD7C /* LoopCircleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B1737128AEDBF6006CCD7C /* LoopCircleView.swift */; };
31+
14B1737528AEDBF6006CCD7C /* LoopCircleEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B1737128AEDBF6006CCD7C /* LoopCircleEntryView.swift */; };
3232
14B1737628AEDC6C006CCD7C /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
3333
14B1737728AEDC6C006CCD7C /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; };
3434
14B1737828AEDC6C006CCD7C /* NSTimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439897341CD2F7DE00223065 /* NSTimeInterval.swift */; };
@@ -465,8 +465,6 @@
465465
C19C8C1E28663B040056D5E4 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4344628320A7A3BE00C4BE6F /* LoopKit.framework */; };
466466
C19C8C1F28663B040056D5E4 /* LoopKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4344628320A7A3BE00C4BE6F /* LoopKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
467467
C19C8C21286776C20056D5E4 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C19C8C20286776C20056D5E4 /* LoopKit.framework */; };
468-
C19E96DF23D275F8003F79B0 /* LoopCompletionFreshness.swift in Sources */ = {isa = PBXBuildFile; fileRef = C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */; };
469-
C19E96E023D275FA003F79B0 /* LoopCompletionFreshness.swift in Sources */ = {isa = PBXBuildFile; fileRef = C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */; };
470468
C19F48742560ABFB003632D7 /* NSBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430DA58D1D4AEC230097D1CA /* NSBundle.swift */; };
471469
C1AD4200256D61E500164DDD /* Comparable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1AD41FF256D61E500164DDD /* Comparable.swift */; };
472470
C1AF062329426300002C1B19 /* ManualGlucoseEntryRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1AF062229426300002C1B19 /* ManualGlucoseEntryRow.swift */; };
@@ -744,7 +742,7 @@
744742
14B1736E28AEDBF6006CCD7C /* BasalView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasalView.swift; sourceTree = "<group>"; };
745743
14B1736F28AEDBF6006CCD7C /* SystemStatusWidget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemStatusWidget.swift; sourceTree = "<group>"; };
746744
14B1737028AEDBF6006CCD7C /* GlucoseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseView.swift; sourceTree = "<group>"; };
747-
14B1737128AEDBF6006CCD7C /* LoopCircleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopCircleView.swift; sourceTree = "<group>"; };
745+
14B1737128AEDBF6006CCD7C /* LoopCircleEntryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopCircleEntryView.swift; sourceTree = "<group>"; };
748746
14D906F32A846510006EB79A /* FavoriteFoodsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoriteFoodsViewModel.swift; sourceTree = "<group>"; };
749747
1D05219A2469E9DF000EBBDE /* StoredAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoredAlert.swift; sourceTree = "<group>"; };
750748
1D05219C2469F1F5000EBBDE /* AlertStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertStore.swift; sourceTree = "<group>"; };
@@ -1155,6 +1153,7 @@
11551153
7DD382791F8DBFC60071272B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Interface.strings; sourceTree = "<group>"; };
11561154
7E69CFFB2A16A77E00203CBD /* ResetLoopManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetLoopManager.swift; sourceTree = "<group>"; };
11571155
80F864E52433BF5D0026EC26 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1156+
840A2F0D2C0F978E003D5E90 /* LoopKitUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKitUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
11581157
8496F7302B5711C4003E672C /* ContentMargin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentMargin.swift; sourceTree = "<group>"; };
11591158
84AA81D22A4A27A3000B658B /* LoopWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopWidgets.swift; sourceTree = "<group>"; };
11601159
84AA81D52A4A28AF000B658B /* WidgetBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetBackground.swift; sourceTree = "<group>"; };
@@ -1478,7 +1477,6 @@
14781477
C19E387C298638CE00851444 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
14791478
C19E387D298638CE00851444 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
14801479
C19E387E298638CE00851444 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1481-
C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopCompletionFreshness.swift; sourceTree = "<group>"; };
14821480
C19F496225630504003632D7 /* Minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; };
14831481
C1AD41FF256D61E500164DDD /* Comparable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Comparable.swift; sourceTree = "<group>"; };
14841482
C1AD48CE298639890013B994 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -2128,7 +2126,6 @@
21282126
43DE92581C5479E4001FFDE1 /* PotentialCarbEntryUserInfo.swift */,
21292127
43C05CB721EBEA54006FB252 /* HKUnit.swift */,
21302128
434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */,
2131-
C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */,
21322129
430B29892041F54A00BA9F93 /* NSUserDefaults.swift */,
21332130
431E73471FF95A900069B5F7 /* PersistenceController.swift */,
21342131
43D9FFD121EAE05D00AF44BF /* LoopCore.h */,
@@ -2477,7 +2474,7 @@
24772474
children = (
24782475
14B1736E28AEDBF6006CCD7C /* BasalView.swift */,
24792476
14B1737028AEDBF6006CCD7C /* GlucoseView.swift */,
2480-
14B1737128AEDBF6006CCD7C /* LoopCircleView.swift */,
2477+
14B1737128AEDBF6006CCD7C /* LoopCircleEntryView.swift */,
24812478
84AA81E22A4A36FB000B658B /* SystemActionLink.swift */,
24822479
84AA81E62A4A4DEF000B658B /* PumpView.swift */,
24832480
);
@@ -2629,6 +2626,7 @@
26292626
968DCD53F724DE56FFE51920 /* Frameworks */ = {
26302627
isa = PBXGroup;
26312628
children = (
2629+
840A2F0D2C0F978E003D5E90 /* LoopKitUI.framework */,
26322630
C159C82E286787EF00A86EC0 /* LoopKit.framework */,
26332631
C159C8212867859800A86EC0 /* MockKitUI.framework */,
26342632
C159C8192867857000A86EC0 /* LoopKitUI.framework */,
@@ -3510,7 +3508,7 @@
35103508
14B1737428AEDBF6006CCD7C /* GlucoseView.swift in Sources */,
35113509
14B1737328AEDBF6006CCD7C /* SystemStatusWidget.swift in Sources */,
35123510
84AA81DD2A4A2999000B658B /* StatusWidgetTimelineProvider.swift in Sources */,
3513-
14B1737528AEDBF6006CCD7C /* LoopCircleView.swift in Sources */,
3511+
14B1737528AEDBF6006CCD7C /* LoopCircleEntryView.swift in Sources */,
35143512
8496F7312B5711C4003E672C /* ContentMargin.swift in Sources */,
35153513
);
35163514
runOnlyForDeploymentPostprocessing = 0;
@@ -3818,7 +3816,6 @@
38183816
E9C00EF324C6222400628F35 /* LoopSettings.swift in Sources */,
38193817
C1D0B6312986D4D90098D215 /* LocalizedString.swift in Sources */,
38203818
43C05CB821EBEA54006FB252 /* HKUnit.swift in Sources */,
3821-
C19E96E023D275FA003F79B0 /* LoopCompletionFreshness.swift in Sources */,
38223819
43D9002021EB209400AF44BF /* NSTimeInterval.swift in Sources */,
38233820
C16575762539FEF3004AE16E /* LoopCoreConstants.swift in Sources */,
38243821
C17DDC9D28AC33A1005FBF4C /* PersistedProperty.swift in Sources */,
@@ -3838,7 +3835,6 @@
38383835
E9C00EF224C6221B00628F35 /* LoopSettings.swift in Sources */,
38393836
C1D0B6302986D4D90098D215 /* LocalizedString.swift in Sources */,
38403837
43C05CB921EBEA54006FB252 /* HKUnit.swift in Sources */,
3841-
C19E96DF23D275F8003F79B0 /* LoopCompletionFreshness.swift in Sources */,
38423838
43D9FFFB21EAF3D300AF44BF /* NSTimeInterval.swift in Sources */,
38433839
C16575752539FD60004AE16E /* LoopCoreConstants.swift in Sources */,
38443840
C17DDC9C28AC339E005FBF4C /* PersistedProperty.swift in Sources */,

‎Loop/Managers/LoopDataManager.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ enum LoopUpdateContext: Int {
7575
}
7676

7777
@MainActor
78-
final class LoopDataManager {
78+
final class LoopDataManager: ObservableObject {
7979
nonisolated static let LoopUpdateContextKey = "com.loudnate.Loop.LoopDataManager.LoopUpdateContext"
8080

8181
// Represents the current state of the loop algorithm for display
@@ -98,7 +98,7 @@ final class LoopDataManager {
9898
displayState.output?.recommendation?.automatic
9999
}
100100

101-
private(set) var lastLoopCompleted: Date?
101+
@Published private(set) var lastLoopCompleted: Date?
102102

103103
var deliveryDelegate: DeliveryDelegate?
104104

‎Loop/Models/AutomaticDosingStatus.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
import Foundation
1010

11-
class AutomaticDosingStatus {
12-
@Published var automaticDosingEnabled: Bool
13-
@Published var isAutomaticDosingAllowed: Bool
11+
public class AutomaticDosingStatus: ObservableObject {
12+
@Published public var automaticDosingEnabled: Bool
13+
@Published public var isAutomaticDosingAllowed: Bool
1414

15-
init(automaticDosingEnabled: Bool,
15+
public init(automaticDosingEnabled: Bool,
1616
isAutomaticDosingAllowed: Bool)
1717
{
1818
self.automaticDosingEnabled = automaticDosingEnabled

‎Loop/View Controllers/StatusTableViewController.swift

+4-3
Original file line numberDiff line numberDiff line change
@@ -1605,13 +1605,14 @@ final class StatusTableViewController: LoopChartsTableViewController {
16051605
criticalEventLogExportViewModel: CriticalEventLogExportViewModel(exporterFactory: criticalEventLogExportManager),
16061606
therapySettings: { [weak self] in self?.settingsManager.therapySettings ?? TherapySettings() },
16071607
sensitivityOverridesEnabled: FeatureFlags.sensitivityOverridesEnabled,
1608-
initialDosingEnabled: self.settingsManager.settings.dosingEnabled,
1609-
isClosedLoopAllowed: automaticDosingStatus.$isAutomaticDosingAllowed,
1608+
initialDosingEnabled: self.settingsManager.settings.dosingEnabled, automaticDosingStatus: self.automaticDosingStatus,
16101609
automaticDosingStrategy: self.settingsManager.settings.automaticDosingStrategy,
1610+
lastLoopCompletion: loopManager.$lastLoopCompleted,
16111611
availableSupports: supportManager.availableSupports,
16121612
isOnboardingComplete: onboardingManager.isComplete,
16131613
therapySettingsViewModelDelegate: deviceManager,
1614-
delegate: self)
1614+
delegate: self
1615+
)
16151616
let hostingController = DismissibleHostingController(
16161617
rootView: SettingsView(viewModel: viewModel, localizedAppNameAndVersion: supportManager.localizedAppNameAndVersion)
16171618
.environmentObject(deviceManager.displayGlucosePreference)

‎Loop/View Models/SettingsViewModel.swift

+27-11
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ public class SettingsViewModel: ObservableObject {
7979
let sensitivityOverridesEnabled: Bool
8080
let isOnboardingComplete: Bool
8181
let therapySettingsViewModelDelegate: TherapySettingsViewModelDelegate?
82-
83-
@Published private(set) var isClosedLoopAllowed: Bool
82+
83+
@Published private(set) var automaticDosingStatus: AutomaticDosingStatus
84+
85+
@Published private(set) var lastLoopCompletion: Date?
8486

8587
var closedLoopDescriptiveText: String? {
8688
return delegate?.closedLoopDescriptiveText
@@ -103,6 +105,12 @@ public class SettingsViewModel: ObservableObject {
103105
availableSupports.contains(where: { $0.showsDeleteTestDataUI })
104106
}
105107

108+
var loopStatusCircleFreshness: LoopCompletionFreshness {
109+
let lastLoopCompletion = lastLoopCompletion ?? Date().addingTimeInterval(.minutes(16))
110+
let age = abs(min(0, lastLoopCompletion.timeIntervalSinceNow))
111+
return LoopCompletionFreshness(age: age)
112+
}
113+
106114
lazy private var cancellables = Set<AnyCancellable>()
107115

108116
public init(alertPermissionsChecker: AlertPermissionsChecker,
@@ -115,8 +123,9 @@ public class SettingsViewModel: ObservableObject {
115123
therapySettings: @escaping () -> TherapySettings,
116124
sensitivityOverridesEnabled: Bool,
117125
initialDosingEnabled: Bool,
118-
isClosedLoopAllowed: Published<Bool>.Publisher,
126+
automaticDosingStatus: AutomaticDosingStatus,
119127
automaticDosingStrategy: AutomaticDosingStrategy,
128+
lastLoopCompletion: Published<Date?>.Publisher,
120129
availableSupports: [SupportUI],
121130
isOnboardingComplete: Bool,
122131
therapySettingsViewModelDelegate: TherapySettingsViewModelDelegate?,
@@ -132,8 +141,9 @@ public class SettingsViewModel: ObservableObject {
132141
self.therapySettings = therapySettings
133142
self.sensitivityOverridesEnabled = sensitivityOverridesEnabled
134143
self.closedLoopPreference = initialDosingEnabled
135-
self.isClosedLoopAllowed = false
144+
self.automaticDosingStatus = automaticDosingStatus
136145
self.automaticDosingStrategy = automaticDosingStrategy
146+
self.lastLoopCompletion = nil
137147
self.availableSupports = availableSupports
138148
self.isOnboardingComplete = isOnboardingComplete
139149
self.therapySettingsViewModelDelegate = therapySettingsViewModelDelegate
@@ -156,18 +166,22 @@ public class SettingsViewModel: ObservableObject {
156166
self?.objectWillChange.send()
157167
}
158168
.store(in: &cancellables)
159-
160-
isClosedLoopAllowed
161-
.assign(to: \.isClosedLoopAllowed, on: self)
169+
automaticDosingStatus.objectWillChange.sink { [weak self] in
170+
self?.objectWillChange.send()
171+
}
172+
.store(in: &cancellables)
173+
lastLoopCompletion
174+
.assign(to: \.lastLoopCompletion, on: self)
162175
.store(in: &cancellables)
176+
163177
}
164178
}
165179

166180
// For previews only
167181
@MainActor
168182
extension SettingsViewModel {
169-
fileprivate class FakeClosedLoopAllowedPublisher {
170-
@Published var mockIsClosedLoopAllowed: Bool = false
183+
fileprivate class FakeLastLoopCompletionPublisher {
184+
@Published var mockLastLoopCompletion: Date? = nil
171185
}
172186

173187
static var preview: SettingsViewModel {
@@ -181,11 +195,13 @@ extension SettingsViewModel {
181195
therapySettings: { TherapySettings() },
182196
sensitivityOverridesEnabled: false,
183197
initialDosingEnabled: true,
184-
isClosedLoopAllowed: FakeClosedLoopAllowedPublisher().$mockIsClosedLoopAllowed,
198+
automaticDosingStatus: AutomaticDosingStatus(automaticDosingEnabled: true, isAutomaticDosingAllowed: true),
185199
automaticDosingStrategy: .automaticBolus,
200+
lastLoopCompletion: FakeLastLoopCompletionPublisher().$mockLastLoopCompletion,
186201
availableSupports: [],
187202
isOnboardingComplete: false,
188203
therapySettingsViewModelDelegate: nil,
189-
delegate: nil)
204+
delegate: nil
205+
)
190206
}
191207
}

0 commit comments

Comments
 (0)