Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidepool Merge #133

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Tidepool Merge #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0a5fff0
[COASTAL-1291] plugin identifier is no longer class property (#8)
nhamming Sep 25, 2023
ea5aeba
Merge remote-tracking branch 'origin/dev' into ps2/LOOP-4735/cgm-even…
ps2 Sep 27, 2023
b53aafa
Merge pull request #9 from tidepool-org/ps2/LOOP-4735/cgm-event-store
ps2 Sep 27, 2023
84c3618
[COASTAL-1335] Update Picker Component
Camji55 Jan 12, 2024
674ed7e
[COASTAL-1335] Update Picker Component
Camji55 Jan 12, 2024
2dafc55
[LOOP-4801] adding pump inoperable (#11)
nhamming Jun 7, 2024
3930aa8
Merge tidepool/dev
ps2 Oct 5, 2024
56808fb
disable module verifier for build performance
ps2 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OmniBLE.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
ENABLE_MODULE_VERIFIER = NO;
FRAMEWORK_SEARCH_PATHS = "";
INFOPLIST_FILE = OmniBLE/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -1592,7 +1592,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
ENABLE_MODULE_VERIFIER = NO;
FRAMEWORK_SEARCH_PATHS = "";
INFOPLIST_FILE = OmniBLE/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down
4 changes: 2 additions & 2 deletions OmniBLE/PumpManager/OmniBLEPumpManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ extension OmniBLEPumpManagerError: LocalizedError {

public class OmniBLEPumpManager: DeviceManager {

public static let pluginIdentifier: String = "Omnipod-Dash" // use a single token to make parsing log files easier
public let pluginIdentifier: String = "Omnipod-Dash" // use a single token to make parsing log files easier

public let localizedTitle = LocalizedString("Omnipod DASH", comment: "Generic title of the OmniBLE pump manager")

Expand Down Expand Up @@ -355,7 +355,7 @@ extension OmniBLEPumpManager {

switch podCommState(for: state) {
case .fault:
return .active(.distantPast)
return .pumpInoperable
default:
break
}
Expand Down
2 changes: 1 addition & 1 deletion OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class OmniBLESettingsViewModel: ObservableObject {
switch basalDeliveryState {
case .active(_), .initiatingTempBasal:
return true
case .tempBasal(_), .cancelingTempBasal, .suspending, .suspended(_), .resuming, .none:
default:
return false
}
}
Expand Down
11 changes: 8 additions & 3 deletions OmniBLE/PumpManagerUI/Views/ExpirationReminderPickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,14 @@ struct ExpirationReminderPickerView: View {
}
}
if showingHourPicker {
ResizeablePicker(selection: expirationReminderDefault,
data: Array(Self.expirationReminderHoursAllowed),
formatter: { expirationReminderHourString($0) })
Picker(selection: expirationReminderDefault) {
ForEach(Array(Self.expirationReminderHoursAllowed), id: \.self) { value in
Text(expirationReminderHourString(value))
}
} label: {
EmptyView()
}
.pickerStyle(.wheel)
}
}
}
Expand Down
23 changes: 17 additions & 6 deletions OmniBLE/PumpManagerUI/Views/ManualTempBasalEntryView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,23 @@ struct ManualTempBasalEntryView: View {
Text(String(format: LocalizedString("%1$@ for %2$@", comment: "Summary string for temporary basal rate configuration page"), formatRate(rateEntered), formatDuration(durationEntered)))
}
HStack {
ResizeablePicker(selection: $rateEntered,
data: allowedRates,
formatter: { formatRate($0) })
ResizeablePicker(selection: $durationEntered,
data: Pod.supportedTempBasalDurations,
formatter: { formatDuration($0) })
Picker(selection: $rateEntered) {
ForEach(allowedRates, id: \.self) { value in
Text(formatRate(value))
}
} label: {
EmptyView()
}
.pickerStyle(.wheel)

Picker(selection: $durationEntered) {
ForEach(Pod.supportedTempBasalDurations, id: \.self) { value in
Text(formatDuration(value))
}
} label: {
EmptyView()
}
.pickerStyle(.wheel)
}
.frame(maxHeight: 162.0)
.alert(isPresented: $showingMissingConfigAlert, content: { missingConfigAlert })
Expand Down