feat: Cleaning up shared models.

This commit is contained in:
2024-06-10 09:03:54 -04:00
parent 68da203164
commit 51f7a30701
19 changed files with 383 additions and 339 deletions

View File

@@ -5,9 +5,9 @@ public struct FlaggedEquipmentMeasurementView: View {
@Environment(\.flaggedEquipmentMeasurementStyle) private var style
let measurement: FlaggedEquipmentMeasurement
let measurement: EquipmentMeasurement.FlaggedMeasurement
public init(_ measurement: FlaggedEquipmentMeasurement) {
public init(_ measurement: EquipmentMeasurement.FlaggedMeasurement) {
self.measurement = measurement
}
@@ -29,7 +29,7 @@ public protocol FlaggedEquipmentMeasurementStyle {
}
public struct FlaggedEquipmentMeasurementStyleConfiguration {
public let measurement: FlaggedEquipmentMeasurement
public let measurement: EquipmentMeasurement.FlaggedMeasurement
}
public struct AnyFlaggedEquipmentMeasurementStyle: FlaggedEquipmentMeasurementStyle {
@@ -54,7 +54,7 @@ public struct GridFlaggedEquipmentMeasurementStyle: FlaggedEquipmentMeasurementS
public func makeBody(configuration: Configuration) -> some View {
Grid(alignment: .leading, verticalSpacing: 20) {
ForEach(FlaggedEquipmentMeasurement.Key.allCases) { field in
ForEach(EquipmentMeasurement.FlaggedMeasurement.Key.allCases) { field in
FlaggedView(
field.title,
flagged: configuration.measurement[keyPath: field.flaggedKeyPath]
@@ -93,7 +93,7 @@ extension View {
}
// MARK: - Key
fileprivate extension FlaggedEquipmentMeasurement {
fileprivate extension EquipmentMeasurement.FlaggedMeasurement {
// NOTE: These need to be kept in display order.
enum Key: Hashable, CaseIterable, Identifiable {
case returnPlenum
@@ -122,7 +122,7 @@ fileprivate extension FlaggedEquipmentMeasurement {
}
}
var flaggedKeyPath: KeyPath<FlaggedEquipmentMeasurement, Flagged> {
var flaggedKeyPath: KeyPath<EquipmentMeasurement.FlaggedMeasurement, Flagged> {
switch self {
case .returnPlenum:
return \.returnPlenumPressure