From 0a6fbb4667f1ec5e393e1a1f255a0528f60178f3 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Mon, 25 Sep 2023 15:53:37 -0300 Subject: [PATCH 1/4] [COASTAL-1291] plugin identifier is no longer class property (#5) --- OmniKit/PumpManager/OmnipodPumpManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmniKit/PumpManager/OmnipodPumpManager.swift b/OmniKit/PumpManager/OmnipodPumpManager.swift index b33524a..dc3215e 100644 --- a/OmniKit/PumpManager/OmnipodPumpManager.swift +++ b/OmniKit/PumpManager/OmnipodPumpManager.swift @@ -92,7 +92,7 @@ extension OmnipodPumpManagerError: LocalizedError { public class OmnipodPumpManager: RileyLinkPumpManager { - public static let pluginIdentifier: String = "Omnipod" + public let pluginIdentifier: String = "Omnipod" public let localizedTitle = LocalizedString("Omnipod", comment: "Generic title of the omnipod pump manager") From 7e78573b002600a1c0dda2753a3559cef5aed0bc Mon Sep 17 00:00:00 2001 From: Cameron Ingham Date: Fri, 12 Jan 2024 11:10:00 -0800 Subject: [PATCH 2/4] [COASTAL-1335] Update Picker Component --- .../Views/ExpirationReminderPickerView.swift | 11 ++++++--- .../Views/ManualTempBasalEntryView.swift | 23 ++++++++++++++----- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/OmniKitUI/Views/ExpirationReminderPickerView.swift b/OmniKitUI/Views/ExpirationReminderPickerView.swift index e7a5e5b..6744535 100644 --- a/OmniKitUI/Views/ExpirationReminderPickerView.swift +++ b/OmniKitUI/Views/ExpirationReminderPickerView.swift @@ -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) } } } diff --git a/OmniKitUI/Views/ManualTempBasalEntryView.swift b/OmniKitUI/Views/ManualTempBasalEntryView.swift index a676aaf..9dc1ef8 100644 --- a/OmniKitUI/Views/ManualTempBasalEntryView.swift +++ b/OmniKitUI/Views/ManualTempBasalEntryView.swift @@ -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 }) From 5628aae267eb94be110944d97c83f95bc693fca1 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Fri, 7 Jun 2024 14:10:53 -0300 Subject: [PATCH 3/4] [LOOP-4801] adding pump inoperable (#8) * adding pump inoperable * fault return pumpInoperable --- OmniKit/PumpManager/OmnipodPumpManager.swift | 2 +- OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniKit/PumpManager/OmnipodPumpManager.swift b/OmniKit/PumpManager/OmnipodPumpManager.swift index 51d36c0..e69dde3 100644 --- a/OmniKit/PumpManager/OmnipodPumpManager.swift +++ b/OmniKit/PumpManager/OmnipodPumpManager.swift @@ -490,7 +490,7 @@ extension OmnipodPumpManager { switch podCommState(for: state) { case .fault: - return .active(.distantPast) + return .pumpInoperable default: break } diff --git a/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift b/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift index 081fff7..37937f4 100644 --- a/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift +++ b/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift @@ -159,7 +159,7 @@ class OmnipodSettingsViewModel: ObservableObject { switch basalDeliveryState { case .active(_), .initiatingTempBasal: return true - case .tempBasal(_), .cancelingTempBasal, .suspending, .suspended(_), .resuming, .none: + default: return false } } From 403bce381943eb64bbbc632ee076356d97812dc6 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 31 Oct 2024 09:26:24 -0500 Subject: [PATCH 4/4] disable module verifier for build performance --- OmniKit.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OmniKit.xcodeproj/project.pbxproj b/OmniKit.xcodeproj/project.pbxproj index 3432185..8e0184d 100644 --- a/OmniKit.xcodeproj/project.pbxproj +++ b/OmniKit.xcodeproj/project.pbxproj @@ -1553,7 +1553,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; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1589,7 +1589,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; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1625,7 +1625,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; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1662,7 +1662,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; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1699,7 +1699,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; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OmniKitPlugin/Info.plist; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -1738,7 +1738,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; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OmniKitPlugin/Info.plist; INFOPLIST_KEY_NSHumanReadableCopyright = "";