remove some redundant computations and banner above heart rate graph and change

Author: tituscmd

InfiniLink/Core/Components/Charts/Heart/HeartChartView.swift

@@ -13,7 +13,7 @@ struct HeartChartDataPoint: Identifiable, Equatable {
     let date: Date
     let min: Double
     let max: Double
-    let average: Double
+    let median: Double
     let values: [Double]
 }
 
@@ -67,7 +67,7 @@ struct HeartChartView: View {
                 date: Calendar.current.date(byAdding: .minute, value: 30, to: bucket) ?? bucket,
                 min: values.min() ?? 0,
                 max: values.max() ?? 0,
-                average: {
+                median: {
                     let sorted = values.sorted()
                     let mid = sorted.count / 2
                     return sorted.count % 2 == 0
@@ -119,7 +119,7 @@ struct HeartChartView: View {
 
         PointMark(
             x: .value("Time", point.date),
-            y: .value("BPM", point.average)
+            y: .value("BPM", point.median)
         )
         .foregroundStyle(heartColor)
         .symbolSize(CGSize(width: 7, height: 7))
@@ -136,26 +136,25 @@ struct HeartChartView: View {
 
     // MARK: iOS 16- fixed chart
     func chartPage(for offset: Int) -> some View {
-        let start = Calendar.current.startOfDay(for: Calendar.current.date(byAdding: .day, value: offset, to: Date())!)
-        let end = Date(timeInterval: 86400, since: start)
-        let pagePoints = points.filter { $0.date >= start && $0.date <= end }
-        let pageMin = Int(pagePoints.map({ $0.min }).min() ?? 0)
-        let pageMax = Int(pagePoints.map({ $0.max }).max() ?? 0)
+        let xMin = Calendar.current.startOfDay(for: Calendar.current.date(byAdding: .day, value: offset, to: Date())!)
+        let xMax = Date(timeInterval: 86400, since: xMin)
+        let yMin = displayedMin - 20
+        let yMax = displayedMax + 20
 
         return Chart {
             if let selectedViewHour {
                             RuleMark(x: .value("Selected Hour", selectedViewHour.date, unit: .hour))
                                 .foregroundStyle(Color.gray)
                         }
 
-            ForEach(pagePoints) { point in
+            ForEach(windowPoints) { point in
                 chartContent(for: point, selected: selectedViewHour)
             }
         }
         .frame(height: 280)
         .padding(.horizontal, 8)
-        .chartYScale(domain: (pageMin - 20)...(pageMax + 20))
-        .chartXScale(domain: start...end)
+        .chartYScale(domain: (yMin...yMax))
+        .chartXScale(domain: xMin...xMax)
         .chartXAxis {
             AxisMarks(values: .stride(by: .hour, count: 6)) { value in
                 AxisGridLine(stroke: StrokeStyle(lineWidth: 0.5, dash: [4]))
@@ -174,13 +173,9 @@ struct HeartChartView: View {
                     .contentShape(Rectangle())
                     .gesture(DragGesture(minimumDistance: 0)
                         .onChanged { value in
-                            let leadingPadding: CGFloat = 8
-                            let yAxisWidth: CGFloat = 40
-                            let adjustedWidth = geo.size.width - yAxisWidth - leadingPadding
-                            let clampedX = min(max(value.location.x - leadingPadding, 0), adjustedWidth)
-                            let fraction = clampedX / adjustedWidth
-                            let totalSeconds: TimeInterval = 86400
-                            rawSelectedHour = start.addingTimeInterval(fraction * totalSeconds)
+                            let adjustedWidth = geo.size.width - 48 // 40 y-axis + 8 horizontal padding
+                            let normalizedXPosition = min(max(value.location.x - 8, 0), adjustedWidth) / adjustedWidth
+                            rawSelectedHour = xMin.addingTimeInterval(normalizedXPosition * 86400)
                         }
                         .onEnded { _ in
                             rawSelectedHour = nil
@@ -295,7 +290,7 @@ struct HeartChartView: View {
                                 + Text("BPM")
 
                                 let style = Date.FormatStyle().hour(.defaultDigits(amPM: .abbreviated))
-                                Text("\(rangeFirstHour.formatted(.dateTime.month(.abbreviated).day())), \(rangeFirstHour.formatted(style))–\(rangeLastHour.formatted(style)) · \(selectedViewHour.values.count) \(selectedViewHour.values.count == 1 ? "reading" : "readings") · \(Int(selectedViewHour.average)) BPM avg")
+                                Text("\(rangeFirstHour.formatted(.dateTime.month(.abbreviated).day())), \(rangeFirstHour.formatted(style))–\(rangeLastHour.formatted(style)) · \(selectedViewHour.values.count) \(selectedViewHour.values.count == 1 ? "reading" : "readings")\(selectedViewHour.values.count > 1 ? " · \(Int(selectedViewHour.median)) BPM avg" : "")")
                                     .foregroundColor(.secondary)
                                     .font(.subheadline)
                             }

InfiniLink/Core/HeartView.swift

@@ -45,24 +45,6 @@ struct HeartView: View {
             List {
                 Section {
                     DetailHeaderView(Header(title: String(format: "%.0f", heartPointValues.last ?? 0), subtitle: timestamp(for: chartManager.heartPoints().last), units: "BPM", icon: "heart.fill", accent: .red), width: geo.size.width, animate: (chartManager.heartPoints().last?.timestamp?.timeIntervalSinceNow ?? 60) < 60) {
-                        HStack {
-                            DetailHeaderSubItemView(
-                                title: "Min",
-                                value: heartRate(for: heartPointValues.min() ?? 0)
-                            )
-                            DetailHeaderSubItemView(
-                                title: "Avg",
-                                value: heartRate(for: {
-                                    let ints = heartPointValues.compactMap { Int($0) }
-                                    guard ints.count > 0 else { return 0.0 }
-                                    return Double(ints.reduce(0, +)) / Double(ints.count)
-                                }())
-                            )
-                            DetailHeaderSubItemView(
-                                title: "Max",
-                                value: heartRate(for: heartPointValues.max() ?? 0)
-                            )
-                        }
                     }
                 }
                 .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))