Tidepool Merge

OmniBLE.xcodeproj/project.pbxproj

@@ -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";
@@ -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";

OmniBLE/PumpManager/OmniBLEPumpManager.swift

@@ -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")
 
@@ -355,7 +355,7 @@ extension OmniBLEPumpManager {
 
         switch podCommState(for: state) {
         case .fault:
-            return .active(.distantPast)
+            return .pumpInoperable
         default:
             break
         }

OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift

@@ -166,7 +166,7 @@ class OmniBLESettingsViewModel: ObservableObject {
         switch basalDeliveryState {
         case .active(_), .initiatingTempBasal:
             return true
-        case .tempBasal(_), .cancelingTempBasal, .suspending, .suspended(_), .resuming, .none:
+        default:
             return false
         }
     }

OmniBLE/PumpManagerUI/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)
             }
         }
     }

OmniBLE/PumpManagerUI/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 })