Improve exercise calorie calculation and fix bugs

Author: liamcharger

InfiniLink/Core/Exercise/View Model/ExerciseViewModel.swift

@@ -22,21 +22,21 @@ class ExerciseViewModel: ObservableObject {
     var appDidEnterBackgroundDate: Date?
 
     let exercises = [
-        Exercise(id: "outdoor-run", name: "Outdoor Run", icon: "figure.run", components: [.heart, .steps]),
+        Exercise(id: "outdoor-run", name: "Outdoor Run", icon: "figure.run", components: [.heart, .steps], pace: .jog),
         Exercise(id: "outdoor-cycle", name: "Outdoor Cycle", icon: "figure.outdoor.cycle", components: [.heart]),
-        Exercise(id: "indoor-run", name: "Indoor Run", icon: "figure.run.treadmill", components: [.heart, .steps]),
+        Exercise(id: "indoor-run", name: "Indoor Run", icon: "figure.run.treadmill", components: [.heart, .steps], pace: .jog),
         Exercise(id: "indoor-cycle", name: "Indoor Cycle", icon: "figure.indoor.cycle", components: [.heart]),
         Exercise(id: "strength-training", name: "Strength Training", icon: "figure.strengthtraining.traditional", components: [.heart]),
         Exercise(id: "table-tennis", name: "Table Tennis", icon: "figure.table.tennis", components: [.heart]),
         Exercise(id: "tennis", name: "Tennis", icon: "figure.tennis", components: [.heart]),
-        Exercise(id: "soccer", name: "Soccer", icon: "figure.indoor.soccer", components: [.heart, .steps]),
-        Exercise(id: "basketball", name: "Basketball", icon: "figure.basketball", components: [.heart, .steps]),
-        Exercise(id: "badminton", name: "Badminton", icon: "figure.badminton", components: [.heart, .steps]),
+        Exercise(id: "soccer", name: "Soccer", icon: "figure.indoor.soccer", components: [.heart, .steps], pace: .run),
+        Exercise(id: "basketball", name: "Basketball", icon: "figure.basketball", components: [.heart, .steps], pace: .run),
+        Exercise(id: "badminton", name: "Badminton", icon: "figure.badminton", components: [.heart, .steps], pace: .run),
         Exercise(id: "boxing", name: "Boxing", icon: "figure.boxing", components: [.heart]),
         Exercise(id: "skiing", name: "Skiing", icon: "figure.skiing.downhill", components: [.heart]),
         Exercise(id: "bowling", name: "Bowling", icon: "figure.bowling", components: [.heart, .steps]),
         Exercise(id: "figure.golf", name: "Golf", icon: "figure.golf", components: [.heart, .steps]),
-        Exercise(id: "hockey", name: "Hockey", icon: "figure.hockey", components: [.heart, .steps])
+        Exercise(id: "hockey", name: "Hockey", icon: "figure.hockey", components: [.heart, .steps], pace: .fastRun)
     ]
 
     init() {
@@ -77,15 +77,16 @@ class ExerciseViewModel: ObservableObject {
         currentExercise = exercise
     }
 
-    func saveExercise(_ exercise: String, startDate: Date, heartPoints: [HeartDataPoint], viewContext: NSManagedObjectContext) {
+    func saveExercise(_ exercise: Exercise, startDate: Date, heartPoints: [HeartDataPoint], viewContext: NSManagedObjectContext) {
         let newExercise = UserExercise(context: viewContext)
 
         newExercise.id = UUID()
         newExercise.startDate = startDate
         newExercise.endDate = Date()
-        newExercise.exerciseId = exercise
+        newExercise.exerciseId = exercise.id
         newExercise.heartPoints = NSSet(array: heartPoints)
         newExercise.steps = Int32(stepsTaken)
+        newExercise.caloriesBurned = FitnessCalculator().calculateCaloriesBurned(steps: stepsTaken, pace: exercise.pace)
 
         saveContext(viewContext)
     }

InfiniLink/Core/Exercise/Views/ActiveExerciseView.swift

@@ -51,7 +51,6 @@ struct ActiveExerciseView: View {
                                 .foregroundStyle(.blue)
                             Text(String(exerciseViewModel.stepsTaken))
                         }
-                        // TODO: add to Core Data
                         HStack(spacing: 6) {
                             Image(systemName: "flame.fill")
                                 .foregroundStyle(.orange)
@@ -102,7 +101,7 @@ struct ActiveExerciseView: View {
                     timer?.invalidate()
 
                     if exerciseViewModel.exerciseTime >= 30 {
-                        exerciseViewModel.saveExercise(exercise.id, startDate: Date().addingTimeInterval(-exerciseViewModel.exerciseTime), heartPoints: Array(heartPoints), viewContext: viewContext)
+                        exerciseViewModel.saveExercise(exercise, startDate: Date().addingTimeInterval(-exerciseViewModel.exerciseTime), heartPoints: Array(heartPoints), viewContext: viewContext)
                     }
                 } label: {
                     Text("End Exercise")

InfiniLink/Core/Exercise/Views/ExerciseDetailView.swift

@@ -80,9 +80,7 @@ struct ExerciseDetailView: View {
                 }
                 if exercise().components.contains(.steps) {
                     Section("Steps") {
-                        let calories = FitnessCalculator().calculateCaloriesBurned(steps: Int(userExercise.steps))
-                        
-                        Text("You took \(userExercise.steps) step\(userExercise.steps == 1 ? "" : "s") and burned \(calories > 1 ? String(format: "%.0f", calories) + "calories": "less than one calorie").")
+                        Text("You took \(userExercise.steps) step\(userExercise.steps == 1 ? "" : "s") and burned \(userExercise.caloriesBurned > 1 ? String(format: "%.0f", userExercise.caloriesBurned) + "calories": "less than one calorie").")
                     }
                 }
             }

InfiniLink/Core/StepsView.swift

@@ -13,8 +13,6 @@ struct StepsView: View {
     @ObservedObject var chartManager = ChartManager.shared
     @ObservedObject var personalizationController = PersonalizationController.shared
 
-    @FetchRequest var stepCounts: FetchedResults<StepCounts>
-    
     @AppStorage("stepChartDataSelection") private var dataSelection = 0
 
     let exerciseCalculator = FitnessCalculator()
@@ -27,14 +25,6 @@ struct StepsView: View {
         }
         return 0
     }
-
-    init() {
-        _stepCounts = FetchRequest(
-            entity: StepCounts.entity(),
-            sortDescriptors: [NSSortDescriptor(keyPath: \StepCounts.timestamp, ascending: true)],
-            predicate: NSPredicate(format: "deviceId == %@", BLEManager.shared.pairedDeviceID ?? "")
-        )
-    }
 
     var body: some View {
         GeometryReader { geo in
@@ -45,18 +35,17 @@ struct StepsView: View {
                             let unitsFull = personalizationController.units == .imperial ? "mile" : "kilometer"
                             let units = personalizationController.units == .imperial ? "mi" : "km"
                             let distance = exerciseCalculator.calculateDistance(steps: steps())
-                            let stepsPerUnit = exerciseCalculator.stepsPerUnit(steps: steps())
+                            let stepsPerUnit = exerciseCalculator.stepsPerUnit()
 
                             DetailHeaderSubItemView(title: "Distance",
                                                     value: String(format: "%.2f", distance),
                                                     unit: units,
                                                     icon: ("ruler", Color.blue))
                             DetailHeaderSubItemView(title: "Kcal",
-                                                    value: String(exerciseCalculator.calculateCaloriesBurned(steps: steps())),
+                                                    value: String(format: "%.1f", exerciseCalculator.calculateCaloriesBurned(steps: steps())),
                                                     icon: ("flame", Color.orange))
-                            DetailHeaderSubItemView(title: "Minutes per \(unitsFull)",
-                                                    value: String(format: "%.1f", exerciseCalculator.minutesForDistance(distance: distance)),
-                                                    unit: "min\(distance == 1 ? "" : "s")",
+                            DetailHeaderSubItemView(title: "Total time",
+                                                    value: exerciseCalculator.secondsFormatted(seconds: exerciseCalculator.secondsForDistance(distance: distance)),
                                                     icon: ("stopwatch", Color.primary))
                             DetailHeaderSubItemView(title: "Steps per \(unitsFull)",
                                                     value: String(stepsPerUnit),

InfiniLink/InfiniLink.xcdatamodeld/InfiniLink.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D5040f" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D70" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
     <entity name="BatteryDataPoint" representedClassName="BatteryDataPoint" syncable="YES" codeGenerationType="class">
         <attribute name="deviceId" optional="YES" attributeType="String"/>
         <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
@@ -64,11 +64,12 @@
         <attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
     </entity>
     <entity name="UserExercise" representedClassName="UserExercise" syncable="YES" codeGenerationType="class">
+        <attribute name="caloriesBurned" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="endDate" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="exerciseId" attributeType="String"/>
         <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
         <attribute name="startDate" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="steps" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <relationship name="heartPoints" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="HeartDataPoint" inverseName="exercise" inverseEntity="HeartDataPoint"/>
     </entity>
-</model>
+</model>

InfiniLink/Localizable.xcstrings

@@ -435,6 +435,16 @@
     },
     "Good morning" : {
 
+    },
+    "Great job, you reached your daily step goal today! You've walked %lf %@ and burned around %lf kcal. Keep it up and let's see how many streak days you can build!" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Great job, you reached your daily step goal today! You've walked %1$lf %2$@ and burned around %3$lf kcal. Keep it up and let's see how many streak days you can build!"
+          }
+        }
+      }
     },
     "H" : {
 
@@ -769,9 +779,6 @@
     },
     "To receive reminder notifications, you'll need to give InfiniLink read access to reminders and events." : {
 
-    },
-    "Today you reached your daily step goal! Keep it up, and let's see how many more days can you reach it..." : {
-
     },
     "Total" : {
 
@@ -865,16 +872,6 @@
         }
       }
     },
-    "You're %lld steps away your daily step goal! %@" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "You're %1$lld steps away your daily step goal! %2$@"
-          }
-        }
-      }
-    },
     "You've reached your steps goal" : {
 
     },

InfiniLink/Model/Exercise.swift

@@ -17,4 +17,13 @@ struct Exercise: Identifiable {
     var name: String
     var icon: String
     let components: [ExerciseComponents]
+    let pace: Pace
+    
+    init(id: String, name: String, icon: String, components: [ExerciseComponents], pace: Pace = .avgWalk) {
+        self.id = id
+        self.name = name
+        self.icon = icon
+        self.components = components
+        self.pace = pace
+    }
 }

InfiniLink/Utils/FitnessCalculator.swift

@@ -7,48 +7,48 @@
 
 import Foundation
 
-class FitnessCalculator {
-    enum Pace: Int {
-        case verySlowWalk = 0
-        case slowWalk = 1
-        case avgWalk = 2
-        case briskWalk = 3
-        case jog = 4
-        case run = 5
-        case fastRun = 6
-        case veryFastRun = 7
+enum Pace: Int {
+    case verySlowWalk = 0
+    case slowWalk = 1
+    case avgWalk = 2
+    case briskWalk = 3
+    case jog = 4
+    case run = 5
+    case fastRun = 6
+    case veryFastRun = 7
 
-        var metValue: Double {
-            switch self {
-            case .verySlowWalk: return 2.0
-            case .slowWalk: return 2.8
-            case .avgWalk: return 3.5
-            case .briskWalk: return 4.3
-            case .jog: return 7.0
-            case .run: return 9.8
-            case .fastRun: return 11.0
-            case .veryFastRun: return 13.0
-            }
-        }
-        
-        var milesPerHour: Double {
-            switch self {
-            case .verySlowWalk: return 1.0
-            case .slowWalk: return 2.0
-            case .avgWalk: return 3.0
-            case .briskWalk: return 4.0
-            case .jog: return 5.0
-            case .run: return 6.0
-            case .fastRun: return 7.5
-            case .veryFastRun: return 10.0
-            }
+    var metValue: Double {
+        switch self {
+        case .verySlowWalk: return 2.0
+        case .slowWalk: return 2.8
+        case .avgWalk: return 3.5
+        case .briskWalk: return 4.3
+        case .jog: return 7.0
+        case .run: return 9.8
+        case .fastRun: return 11.0
+        case .veryFastRun: return 13.0
         }
     }
 
+    var milesPerHour: Double {
+        switch self {
+        case .verySlowWalk: return 1.0
+        case .slowWalk: return 2.0
+        case .avgWalk: return 3.0
+        case .briskWalk: return 4.0
+        case .jog: return 5.0
+        case .run: return 6.0
+        case .fastRun: return 7.5
+        case .veryFastRun: return 10.0
+        }
+    }
+}
+
+class FitnessCalculator {
     let personalizationController = PersonalizationController.shared
     let bleManager = BLEManager.shared
 
-    func strideLength(pace: FitnessCalculator.Pace = .avgWalk) -> Double {
+    func strideLength(pace: Pace = .avgWalk) -> Double {
         let avgStrideRatio = personalizationController.gender == .male ? 0.415 : 0.413
         let calculatedHeight = personalizationController.calculatedHeight
         let height = personalizationController.units == .metric ? (calculatedHeight / 2.54) : (calculatedHeight) // Convert to inches
@@ -72,7 +72,7 @@ class FitnessCalculator {
         return strideLength
     }
 
-    func calculateDistance(steps: Int, pace: FitnessCalculator.Pace = .avgWalk) -> Double {
+    func calculateDistance(steps: Int, pace: Pace = .avgWalk) -> Double {
         var distance = strideLength(pace: pace) * Double(steps)
 
         if personalizationController.units == .imperial {
@@ -84,8 +84,7 @@ class FitnessCalculator {
         return distance
     }
 
-    func stepsPerMinute(steps: Int, pace: FitnessCalculator.Pace = .avgWalk) -> Int {
-        // TODO: update for metric
+    func stepsPerMinute(steps: Int, pace: Pace = .avgWalk) -> Int {
         let distance = calculateDistance(steps: steps, pace: pace)
         let timeMinutes = (distance / pace.milesPerHour) * 60.0
 
@@ -95,7 +94,7 @@ class FitnessCalculator {
         return Int(ceil(spm))
     }
 
-    func calculateCaloriesBurned(steps: Int, pace: FitnessCalculator.Pace = .avgWalk) -> Int {
+    func calculateCaloriesBurned(steps: Int, pace: Pace = .avgWalk) -> Double {
         // TODO: support custom duration
         let spm = stepsPerMinute(steps: steps, pace: pace)
         let weight = personalizationController.calculatedWeight
@@ -104,17 +103,31 @@ class FitnessCalculator {
 
         guard durationInHours > 0 else { return 0 }
 
-        let caloriesBurned = Int(ceil(pace.metValue * calculatedWeight * durationInHours))
-        return caloriesBurned
+        return pace.metValue * calculatedWeight * durationInHours
     }
 
-    func minutesForDistance(distance: Double, pace: FitnessCalculator.Pace = .avgWalk) -> Double {
-        let speed = personalizationController.units == .imperial ? pace.milesPerHour : (pace.milesPerHour * 1.60934)
-        return (distance / speed) * 60
-    }
-    
-    func stepsPerUnit(steps: Int, pace: FitnessCalculator.Pace = .avgWalk) -> Int {
+    func stepsPerUnit(pace: Pace = .avgWalk) -> Int {
         let unitInInches = personalizationController.units == .imperial ? 63360 : 39370.1
         return Int(ceil(unitInInches / strideLength()))
     }
+    
+    func secondsForDistance(distance: Double, pace: Pace = .avgWalk) -> Int {
+        let speed: Double = personalizationController.units == .imperial ? pace.milesPerHour : (pace.milesPerHour * 1.60934)
+        
+        return Int(ceil((distance / speed) * 60 * 60))
+    }
+    
+    func secondsFormatted(seconds: Int) -> String {
+        let hours = seconds / 3600
+        let minutes = (seconds % 3600) / 60
+        let seconds = seconds % 60
+        
+        if hours > 0 {
+            return "\(hours) hr\(hours == 1 ? "" : "s") and \(minutes) min\(minutes == 1 ? "" : "s")"
+        } else if minutes > 0 {
+            return "\(minutes) min\(minutes == 1 ? "" : "s")"
+        } else {
+            return "<1 min"
+        }
+    }
 }

InfiniLink/Utils/PersistenceController.swift

@@ -16,24 +16,15 @@ struct PersistenceController {
         container = NSPersistentContainer(name: "InfiniLink")
         if inMemory {
             container.persistentStoreDescriptions.first!.url = URL(fileURLWithPath: "/dev/null")
-        } else {
-            let description = container.persistentStoreDescriptions.first
-            description?.shouldMigrateStoreAutomatically = true
-            description?.shouldInferMappingModelAutomatically = true
         }
-        container.loadPersistentStores(completionHandler: { (storeDescription, error) in
-            if let error {
-                /*
-                 Typical reasons for an error here include:
-                 * The parent directory does not exist, cannot be created, or disallows writing.
-                 * The persistent store is not accessible, due to permissions or data protection when the device is locked.
-                 * The device is out of space.
-                 * The store could not be migrated to the current model version.
-                 Check the error message to determine what the actual problem was.
-                 */
-                log("Unresolved error loading stores: \(error.localizedDescription)", caller: "PersistenceController")
+        container.loadPersistentStores { storeDescription, error in
+            storeDescription.shouldMigrateStoreAutomatically = true
+            storeDescription.shouldInferMappingModelAutomatically = true
+            
+            if let error = error as NSError? {
+                fatalError("Unresolved error \(error), \(error.userInfo)")
             }
-        })
+        }
         container.viewContext.automaticallyMergesChangesFromParent = true
     }