charts: continue implementing charts

Author: liamcharger

.DS_Store

@@ -41,10 +41,22 @@ struct HeartChartView: View {
     var latestDate: Date {
         data().compactMap({ $0.date }).max() ?? Date()
     }
+    var unit: Calendar.Component {
+        switch chartManager.heartRateChartDataSelection {
+        case 1:
+            return .day
+        case 2:
+            return .weekOfMonth
+        case 3:
+            return .month
+        default:
+            return .hour
+        }
+    }
 
     var header: some View {
         VStack(alignment: .leading) {
-            Text(data().count > 1 ? "Range" : " ")
+            Text(data().count > 1 ? "Range" : "No Data")
             Text({
                 let max = Int(data().compactMap({ $0.max }).max() ?? 0)
                 let min = Int(data().compactMap({ $0.min }).min() ?? 0)
@@ -58,7 +70,7 @@ struct HeartChartView: View {
             .font(.system(.title, design: .rounded))
             .foregroundColor(.primary)
             + Text("BPM")
-            Text("\(earliestDate.formatted())-\(latestDate.formatted())")
+            Text("\(earliestDate.formatted(.dateTime.month(.abbreviated).day()))-\(latestDate.formatted(.dateTime.day()))")
         }
         .fontWeight(.semibold)
     }
@@ -72,7 +84,7 @@ struct HeartChartView: View {
             Chart(data(), id: \.id) { point in
                 Plot {
                     BarMark(
-                        x: .value("Day", point.date, unit: .day),
+                        x: .value("Day", point.date, unit: unit),
                         yStart: .value("BPM Min", point.min),
                         yEnd: .value("BPM Max", point.max),
                         width: .fixed(8)

InfiniLink/.DS_Store

@@ -39,7 +39,7 @@ struct HeartView: View {
         return NSLocalizedString("Now", comment: "")
     }
     func timestamp(for heartPoint: HeartDataPoint?) -> String? {
-        guard let timeInterval = heartPoint?.timestamp?.timeIntervalSinceNow else { return "No data" }
+        guard let timeInterval = heartPoint?.timestamp?.timeIntervalSinceNow else { return " " }
 
         return units(for: Int(abs(timeInterval)))
     }
@@ -57,7 +57,11 @@ struct HeartView: View {
                                 )
                                 DetailHeaderSubItemView(
                                     title: "Avg",
-                                    value: heartRate(for: Double(heartPointValues.compactMap({ Int($0) }).reduce(0, +) / heartPointValues.count)))
+                                    value: heartRate(for: {
+                                        guard heartPointValues.count > 0 else { return Double(0) }
+                                        
+                                        return Double(heartPointValues.compactMap({ Int($0) }).reduce(0, +) / heartPointValues.count)
+                                    }()))
                                 DetailHeaderSubItemView(
                                     title: "Max",
                                     value: heartRate(for: heartPointValues.max() ?? 0)

InfiniLink/Assets.xcassets/.DS_Store

@@ -546,6 +546,9 @@
     },
     "Next" : {
 
+    },
+    "No Data" : {
+
     },
     "No Exercises" : {
 

InfiniLink/Core/Components/Charts/HeartChartView.swift

@@ -13,7 +13,7 @@ class ChartManager: ObservableObject {
     let viewContext = PersistenceController.shared.container.viewContext
     let bleManager = BLEManager.shared
 
-    @AppStorage("heartRateChartDataSelection") private var heartRateChartDataSelection = 0
+    @AppStorage("heartRateChartDataSelection") var heartRateChartDataSelection = 0
 
     static let shared = ChartManager()