Bugfix: fix step message appearing at wrong times and add formatting to step values

Author: liamcharger

InfiniLink/Core/Components/Charts/Steps/StepChartView.swift

@@ -167,7 +167,7 @@ struct StepChartView: View {
             Section {
                 let steps = Int(chartManager.stepPoints().last?.steps ?? 0)
 
-                if stepCountManager.hasReachedStepGoal {
+                if bleManager.stepCount >= deviceManager.settings.stepsGoal {
                     Text("Great job, you reached your daily step goal today! You've walked \(String(format: "%.2f", fitnessCalculator.calculateDistance(steps: steps))) \(personalizationController.units == .imperial ? "miles" : "kilometers") and burned around \(fitnessCalculator.calculateCaloriesBurned(steps: steps)) kcal.")
                 } else {
                     let stepsRemaining = stepCountManager.stepGoal - steps

InfiniLink/Core/StepsView.swift

@@ -19,6 +19,9 @@ struct StepsView: View {
 
     let exerciseCalculator = FitnessCalculator()
 
+    func formattedSteps(_ steps: Int) -> String {
+        Formatter.localizedDecimal.string(from: NSNumber(value: steps)) ?? "\(steps)"
+    }
     func steps() -> Int {
         let stepCount = chartManager.stepsToday()
         if let stepCount = stepCount {
@@ -31,7 +34,7 @@ struct StepsView: View {
         GeometryReader { geo in
             List {
                 Section {
-                    DetailHeaderView(Header(title: "\(steps())", subtitle: String(deviceManager.settings.stepsGoal), units: "Steps", icon: "figure.walk", accent: .blue), width: geo.size.width) {
+                    DetailHeaderView(Header(title: "\(formattedSteps(steps()))", subtitle: formattedSteps(Int(deviceManager.settings.stepsGoal)), units: "Steps", icon: "figure.walk", accent: .blue), width: geo.size.width) {
                         LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())]) {
                             let units = personalizationController.units == .imperial ? "mi" : "km"
                             let distance = exerciseCalculator.calculateDistance(steps: steps())

InfiniLink/Utils/StepCountManager.swift

@@ -20,9 +20,6 @@ class StepCountManager: ObservableObject {
     var stepGoal: Int {
         return Int(DeviceManager.shared.settings.stepsGoal)
     }
-    var hasReachedStepGoal: Bool {
-        return BLEManager.shared.stepCount >= stepGoal
-    }
 
     // The following two functions need to use the viewContext to save because the objects they're updating were fetched on that context
     func setStepCount(steps: Int32, isArbitrary: Bool, for date: Date) {