diff --git a/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate b/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate index 5e3d2c5..4e782c2 100644 Binary files a/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate and b/TempTrack.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TempTrack/Storage/PersistentStorage.swift b/TempTrack/Storage/PersistentStorage.swift index c71602c..57d8c56 100644 --- a/TempTrack/Storage/PersistentStorage.swift +++ b/TempTrack/Storage/PersistentStorage.swift @@ -167,9 +167,12 @@ final class PersistentStorage: ObservableObject { } func removeMeasurements(for dateIndex: Int) { + defer { saveDailyCounts() } let fileUrl = fileUrl(for: dateIndex) guard fm.fileExists(atPath: fileUrl.path) else { log.warning("No measurements for \(fileUrl.lastPathComponent)") + dailyMeasurementCounts = dailyMeasurementCounts.filter { $0.dateIndex != dateIndex } + recentMeasurements = recentMeasurements.filter { $0.date.dateIndex != dateIndex } return } do { diff --git a/TempTrack/Temperature/TemperatureMeasurement.swift b/TempTrack/Temperature/TemperatureMeasurement.swift index 80eba0d..d237473 100644 --- a/TempTrack/Temperature/TemperatureMeasurement.swift +++ b/TempTrack/Temperature/TemperatureMeasurement.swift @@ -53,10 +53,7 @@ struct TemperatureMeasurement: Identifiable { } var displayText: String { - guard let averageValue else { - return "-" - } - return String(format: "%.1f °C", averageValue) + "\(sensor0.text) / \(sensor1.text)" } } diff --git a/TempTrack/Temperature/TemperatureValue.swift b/TempTrack/Temperature/TemperatureValue.swift index 69002b5..e8fc581 100644 --- a/TempTrack/Temperature/TemperatureValue.swift +++ b/TempTrack/Temperature/TemperatureValue.swift @@ -23,7 +23,7 @@ enum TemperatureValue { case .invalidMeasurement: return 1 case .value(let double): - let value = Int(double + 40) * 2 + let value = (double * 2).roundedInt + 80 return UInt8(clamping: value) } } @@ -45,11 +45,11 @@ enum TemperatureValue { var text: String { switch self { case .notFound: - return "No sensor" + return "-" case .invalidMeasurement: - return "Invalid" + return "?" case .value(let value): - return String(format:"%.1f°C", value) + return String(format:"%.1f°", value) } } } diff --git a/TempTrack/Views/DayView.swift b/TempTrack/Views/DayView.swift index b170d6e..3bf6c77 100644 --- a/TempTrack/Views/DayView.swift +++ b/TempTrack/Views/DayView.swift @@ -7,6 +7,13 @@ private let df: DateFormatter = { return df }() +private let dateFormatter: DateFormatter = { + let df = DateFormatter() + df.dateStyle = .medium + df.timeStyle = .none + return df +}() + struct DayView: View { let dateIndex: Int diff --git a/TempTrack/Views/TemperatureDayOverview.swift b/TempTrack/Views/TemperatureDayOverview.swift index fe14f4a..67aace4 100644 --- a/TempTrack/Views/TemperatureDayOverview.swift +++ b/TempTrack/Views/TemperatureDayOverview.swift @@ -47,7 +47,7 @@ struct TemperatureDayOverview: View { } } } - .aspectRatio(2.6, contentMode: .fit) + .aspectRatio(1, contentMode: .fit) //.chartXScale(domain: pastDateLimit...futureDateLimit) .chartYScale(domain: lowerTempLimit...upperTempLimit) .chartXAxis { @@ -71,7 +71,6 @@ struct TemperatureDayOverview: View { AxisGridLine() } } - .padding() } }