Heart rate chart redesign

InfiniLink/Core/Components/Charts/EmptyChartView.swift

@@ -20,27 +20,9 @@ struct Line: Shape {
 }
 
 struct EmptyChartView: View {
-    @AppStorage("heartRateChartDataSelection") private var dataSelection = 0
-
     let chartType: ChartType
 
     private let backgroundColor = Color.primary.opacity(0.35)
-    private var detailString: String {
-        var base = "There isn't any \(chartType.rawValue) data to show "
-
-        switch dataSelection {
-        case 1:
-            base += "for today"
-        case 2:
-            base += "for the week"
-        case 3:
-            base += "for the month"
-        default:
-            base += "for the current hour"
-        }
-
-        return base
-    }
 
     init(_ chartType: ChartType) {
         self.chartType = chartType
@@ -64,7 +46,7 @@ struct EmptyChartView: View {
                 VStack {
                     Text("Nothing to see here")
                         .font(.title2.weight(.bold))
-                    Text(detailString)
+                    Text("There isn't any \(chartType.rawValue) data to show")
                         .foregroundStyle(.gray)
                 }
             }

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))

InfiniLink/Core/Settings/HeartSettingsView.swift

@@ -10,6 +10,7 @@ import SwiftUI
 struct HeartSettingsView: View {
     @AppStorage("backgroundHRMMeasurements") var backgroundHRMMeasurements = false
     @AppStorage("filterHeartRateData") var filterHeartRateData = true
+    @AppStorage("heartPointMarkMode") var heartPointMarkMode = "average"
 
     @FetchRequest(sortDescriptors: [SortDescriptor(\.timestamp)]) var heartPoints: FetchedResults<HeartDataPoint>
 
@@ -60,6 +61,13 @@ struct HeartSettingsView: View {
             Section(footer: Text("Filter inconsistent data from your heart rate measurements.")) {
                 Toggle("Filter Values", isOn: $filterHeartRateData)
             }
+            Section(footer: Text("Choose how the point mark on the heart rate chart is calculated.")) {
+                Picker("Point Mark", selection: $heartPointMarkMode) {
+                    Text("Average").tag("average")
+                    Text("Median").tag("median")
+                }
+                .pickerStyle(.menu)
+            }
             Button {
                 exportCSV(generateCSV(from: Array(heartPoints)))
             } label: {

InfiniLink/Localizable.xcstrings

@@ -97,12 +97,12 @@
         }
       }
     },
-    "%@-%@" : {
+    "%@, %@–%@ · %lld %@%@" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "%1$@-%2$@"
+            "value" : "%1$@, %2$@–%3$@ · %4$lld %5$@%6$@"
           }
         }
       }
@@ -175,12 +175,15 @@
         }
       }
     },
-    "%lld-%lld " : {
+    "%lld-day" : {
+
+    },
+    "%lld–%lld " : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "%1$lld-%2$lld "
+            "value" : "%1$lld–%2$lld "
           }
         }
       }
@@ -272,6 +275,9 @@
           }
         }
       }
+    },
+    "avg" : {
+
     },
     "Back" : {
 
@@ -311,6 +317,9 @@
     },
     "Checking for updates..." : {
 
+    },
+    "Choose how the point mark on the heart rate chart is calculated." : {
+
     },
     "Clear All Exercises" : {
 
@@ -822,6 +831,9 @@
           }
         }
       }
+    },
+    "Max" : {
+
     },
     "Maximum" : {
       "localizations" : {
@@ -832,9 +844,18 @@
           }
         }
       }
+    },
+    "mdn" : {
+
+    },
+    "Median" : {
+
     },
     "Metric" : {
 
+    },
+    "Min" : {
+
     },
     "Minimum" : {
 
@@ -872,9 +893,6 @@
     },
     "No" : {
 
-    },
-    "No Data" : {
-
     },
     "No Logs" : {
 
@@ -936,6 +954,9 @@
     },
     "Pinned" : {
 
+    },
+    "Point Mark" : {
+
     },
     "Poor" : {
 
@@ -990,6 +1011,9 @@
     },
     "Selected" : {
 
+    },
+    "Selected Hour" : {
+
     },
     "Send" : {
 
@@ -1166,6 +1190,9 @@
     },
     "There aren't any available releases." : {
 
+    },
+    "There isn't any %@ data to show" : {
+
     },
     "There wasn't any heart rate data recorded for this exercise." : {
 
@@ -1206,16 +1233,6 @@
     },
     "To start a route, you need to enable \"Always Allow\" location permissions for InfiniLink in Settings." : {
 
-    },
-    "Today your heart rate reached a high of %lld, and dropped to a low of %lld BPM." : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Today your heart rate reached a high of %1$lld, and dropped to a low of %2$lld BPM."
-          }
-        }
-      }
     },
     "Total" : {
 
@@ -1456,4 +1473,4 @@
     }
   },
   "version" : "1.1"
-}
+}

InfiniLink/Model/ChartType.swift

@@ -20,7 +20,7 @@ enum ChartType: String {
         case .heart:
             return "heart.fill"
         case .battery:
-            return "battery.20.fill"
+            return "battery.50percent.fill"
         case .sleep:
             return "moon.fill"
         }

InfiniLink/Utils/ChartManager.swift

@@ -10,9 +10,6 @@ import SwiftUI
 import CoreData
 
 class ChartManager: ObservableObject {
-    @AppStorage("heartRateChartDataSelection") var heartRateChartDataSelection = 0
-    @AppStorage("stepChartDataSelection") var stepChartDataSelection = 0
-
     static let shared = ChartManager()
 
     let persistenceController = PersistenceController.shared

README.md

@@ -17,7 +17,6 @@
 - Download and install InfiniTime firmware updates from releases and GitHub Actions using the GitHub API (local file updates are supported)
 
 ### Partially implemented features:
-- Apple Charts with date range selection
 - System-wide notifications—implemented in [#2217](https://github.com/InfiniTimeOrg/InfiniTime/pull/2217), but not available in the main branch yet.
 
 ### Currently non-functional features: