Update fitness calculation methods and UX

Author: liamcharger

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

@@ -19,6 +19,7 @@ struct StepChartView: View {
     @ObservedObject var chartManager = ChartManager.shared
     @ObservedObject var deviceManager = DeviceManager.shared
     @ObservedObject var stepCountManager = StepCountManager.shared
+    @ObservedObject var personalizationController = PersonalizationController.shared
 
     @AppStorage("stepChartDataSelection") var stepChartDataSelection = 0
 
@@ -27,6 +28,8 @@ struct StepChartView: View {
     @State private var selectedDate = Date()
     @State private var selectedSteps = 0
 
+    let fitnessCalculator = FitnessCalculator()
+    
     func steps() -> [StepChartDataPoint] {
         let calendar = Calendar.current
         let now = Date()
@@ -142,17 +145,23 @@ struct StepChartView: View {
             .listRowBackground(Color.clear)
             .listRowInsets(EdgeInsets(top: 18, leading: 0, bottom: 0, trailing: 0))
             Section {
+                let steps = Int(chartManager.stepPoints().last?.steps ?? 0)
+                
                 if stepCountManager.hasReachedStepGoal {
-                    Text("Today you reached your daily step goal! Keep it up, and let's see how many more days can you reach it...")
+                    Text("Great job, you reached your daily step goal today! You've walked \(fitnessCalculator.calculateDistance(steps: steps)) \(personalizationController.units == .imperial ? "miles" : "kilometers") and burned around \(fitnessCalculator.calculateCaloriesBurned(steps: steps)) kcal.")
                 } else {
-                    let encouragementString: String = {
-                        if (stepCountManager.stepGoal - bleManager.stepCount) <= 1000 {
-                            return "Take a short walk or a start an activity to complete your goal."
-                        }
-                        return "Complete a few activities to reach your goal."
-                    }()
+                    let stepsRemaining = stepCountManager.stepGoal - steps
+                    let distanceRemaining = fitnessCalculator.calculateDistance(steps: stepsRemaining)
+                    let caloriesRemaining = fitnessCalculator.calculateCaloriesBurned(steps: stepsRemaining)
+                    let timeRemaining = fitnessCalculator.secondsFormatted(seconds: Int(fitnessCalculator.secondsForDistance(distance: distanceRemaining)), full: true)
 
-                    Text("You're \(stepCountManager.stepGoal - bleManager.stepCount) steps away your daily step goal! \(encouragementString)")
+                    if stepsRemaining <= 1000 {
+                        Text("You're almost there! A quick \(String(format: "%.1f", distanceRemaining)) \(personalizationController.units == .imperial ? "mile" : "km") walk will get you to your goal. It should only take you about \(timeRemaining).")
+                    } else if stepsRemaining <= 2500 {
+                        Text("You're making great progress! You have about \(String(format: "%.1f", distanceRemaining)) \(personalizationController.units == .imperial ? "miles" : "kilometers") to walk. At your current pace, you'll hit your goal in \(timeRemaining).")
+                    } else {
+                        Text("You're \(stepsRemaining) steps away from your goal, which is about \(String(format: "%.1f", distanceRemaining)) \(personalizationController.units == .imperial ? "miles" : "kilometers"). Once you complete your goal, you'll have burned \(caloriesRemaining) kcal and walked for about \(timeRemaining)!")
+                    }
                 }
             }
         }

InfiniLink/Core/Components/DetailHeaderView.swift

@@ -30,12 +30,14 @@ struct DetailHeaderSubItemView: View {
     let value: String
     let unit: String?
     let icon: (String, Color)?
+    let completion: (() -> Void)?
 
-    init(title: String, value: String, unit: String? = nil, icon: (String, Color)? = nil) {
+    init(title: String, value: String, unit: String? = nil, icon: (String, Color)? = nil, completion: (() -> Void)? = nil) {
         self.title = title
         self.value = value
         self.unit = unit
         self.icon = icon
+        self.completion = completion
     }
 
     var body: some View {
@@ -47,9 +49,18 @@ struct DetailHeaderSubItemView: View {
                     .frame(minWidth: 30)
             }
             VStack(alignment: .leading, spacing: 3) {
-                Text(title.uppercased())
-                    .font(.caption)
-                    .foregroundStyle(.gray)
+                HStack(alignment: .top, spacing: 3) {
+                    Text(title.uppercased())
+                        .font(.caption.weight(.medium))
+                    if let completion {
+                        Image(systemName: "info.circle")
+                            .font(.caption.weight(.medium))
+                            .onTapGesture {
+                                completion()
+                            }
+                    }
+                }
+                .foregroundStyle(.gray)
                 HStack(alignment: .firstTextBaseline, spacing: 2) {
                     Text(value)
                         .font(.system(size: 22).weight(.semibold))

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

@@ -86,7 +86,7 @@ class ExerciseViewModel: ObservableObject {
         newExercise.exerciseId = exercise.id
         newExercise.heartPoints = NSSet(array: heartPoints)
         newExercise.steps = Int32(stepsTaken)
-        newExercise.caloriesBurned = FitnessCalculator().calculateCaloriesBurned(steps: stepsTaken, pace: exercise.pace)
+        newExercise.caloriesBurned = Int32(FitnessCalculator().calculateCaloriesBurned(steps: stepsTaken, pace: exercise.pace))
 
         saveContext(viewContext)
     }

InfiniLink/Core/Exercise/Views/ActiveExerciseView.swift

@@ -54,7 +54,7 @@ struct ActiveExerciseView: View {
                         HStack(spacing: 6) {
                             Image(systemName: "flame.fill")
                                 .foregroundStyle(.orange)
-                            Text(String(format: "%.1f", fitnessCalculator.calculateCaloriesBurned(steps: exerciseViewModel.stepsTaken)))
+                            Text("\(fitnessCalculator.calculateCaloriesBurned(steps: exerciseViewModel.stepsTaken))")
                         }
                     }
                 }

InfiniLink/Core/StepsView.swift

@@ -13,6 +13,8 @@ struct StepsView: View {
     @ObservedObject var chartManager = ChartManager.shared
     @ObservedObject var personalizationController = PersonalizationController.shared
 
+    @State private var showInfoAlert = false
+    
     @AppStorage("stepChartDataSelection") private var dataSelection = 0
 
     let exerciseCalculator = FitnessCalculator()
@@ -32,7 +34,6 @@ struct StepsView: View {
                 Section {
                     DetailHeaderView(Header(title: "\(steps())", subtitle: String(deviceManager.settings.stepsGoal), units: "Steps", icon: "figure.walk", accent: .blue), width: geo.size.width) {
                         LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())]) {
-                            let unitsFull = personalizationController.units == .imperial ? "mile" : "kilometer"
                             let units = personalizationController.units == .imperial ? "mi" : "km"
                             let distance = exerciseCalculator.calculateDistance(steps: steps())
                             let stepsPerUnit = exerciseCalculator.stepsPerUnit()
@@ -42,15 +43,16 @@ struct StepsView: View {
                                                     unit: units,
                                                     icon: ("ruler", Color.blue))
                             DetailHeaderSubItemView(title: "Kcal",
-                                                    value: String(format: "%.1f", exerciseCalculator.calculateCaloriesBurned(steps: steps())),
+                                                    value: "\(exerciseCalculator.calculateCaloriesBurned(steps: steps()))",
                                                     icon: ("flame", Color.orange))
                             DetailHeaderSubItemView(title: "Total time",
                                                     value: exerciseCalculator.secondsFormatted(seconds: exerciseCalculator.secondsForDistance(distance: distance)),
                                                     icon: ("stopwatch", Color.primary))
-                            DetailHeaderSubItemView(title: "Steps per \(unitsFull)",
+                            DetailHeaderSubItemView(title: "SPM",
                                                     value: String(stepsPerUnit),
-                                                    unit: "step\(stepsPerUnit == 1 ? "" : "s")",
-                                                    icon: ("shoeprints.fill", Color.blue))
+                                                    icon: ("shoeprints.fill", Color.blue)) {
+                                showInfoAlert = true
+                            }
                         }
                     }
                     .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
@@ -62,6 +64,9 @@ struct StepsView: View {
         }
         .navigationTitle("Steps")
         .navigationBarTitleDisplayMode(.inline)
+        .alert(isPresented: $showInfoAlert) {
+            Alert(title: Text("Steps Per Minute"), message: Text("SPM stands for steps per minute and measures how many steps you take for each minute of walking."), dismissButton: .default(Text("OK")))
+        }
     }
 }
 

InfiniLink/InfiniLink.xcdatamodeld/InfiniLink.xcdatamodel/contents

@@ -64,7 +64,7 @@
         <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="caloriesBurned" optional="YES" attributeType="Integer 32" 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"/>

InfiniLink/Localizable.xcstrings

@@ -436,12 +436,12 @@
     "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!" : {
+    "Great job, you reached your daily step goal today! You've walked %lf %@ and burned around %lld kcal." : {
       "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!"
+            "value" : "Great job, you reached your daily step goal today! You've walked %1$lf %2$@ and burned around %3$lld kcal."
           }
         }
       }
@@ -709,6 +709,9 @@
     },
     "Software Version" : {
 
+    },
+    "SPM stands for steps per minute and measures how many steps you take for each minute of walking." : {
+
     },
     "Start Pairing" : {
 
@@ -731,6 +734,9 @@
     },
     "Steps Goal" : {
 
+    },
+    "Steps Per Minute" : {
+
     },
     "Sync step and heart rate data to Apple Health." : {
 
@@ -872,6 +878,36 @@
         }
       }
     },
+    "You're %lld steps away from your goal, which is about %@ %@. Once you complete your goal, you'll have burned %lld kcal and walked for about %@!" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "You're %1$lld steps away from your goal, which is about %2$@ %3$@. Once you complete your goal, you'll have burned %4$lld kcal and walked for about %5$@!"
+          }
+        }
+      }
+    },
+    "You're almost there! A quick %@ %@ walk will get you to your goal. It should only take you about %@." : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "You're almost there! A quick %1$@ %2$@ walk will get you to your goal. It should only take you about %3$@."
+          }
+        }
+      }
+    },
+    "You're making great progress! You have about %@ %@ to walk. At your current pace, you'll hit your goal in %@." : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "You're making great progress! You have about %1$@ %2$@ to walk. At your current pace, you'll hit your goal in %3$@."
+          }
+        }
+      }
+    },
     "You've reached your steps goal" : {
 
     },

InfiniLink/Utils/FitnessCalculator.swift

@@ -94,7 +94,7 @@ class FitnessCalculator {
         return Int(ceil(spm))
     }
 
-    func calculateCaloriesBurned(steps: Int, pace: Pace = .avgWalk) -> Double {
+    func calculateCaloriesBurned(steps: Int, pace: Pace = .avgWalk) -> Int {
         // TODO: support custom duration
         let spm = stepsPerMinute(steps: steps, pace: pace)
         let weight = personalizationController.calculatedWeight
@@ -103,7 +103,7 @@ class FitnessCalculator {
 
         guard durationInHours > 0 else { return 0 }
 
-        return pace.metValue * calculatedWeight * durationInHours
+        return Int(ceil(pace.metValue * calculatedWeight * durationInHours))
     }
 
     func stepsPerUnit(pace: Pace = .avgWalk) -> Int {
@@ -117,17 +117,16 @@ class FitnessCalculator {
         return Int(ceil((distance / speed) * 60 * 60))
     }
 
-    func secondsFormatted(seconds: Int) -> String {
+    func secondsFormatted(seconds: Int, full: Bool = false) -> 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")"
+            return "\(hours) \(full ? "hour" : "hr")\(hours == 1 ? "" : "s") and \(minutes) \(full ? "minute" : "min")\(minutes == 1 ? "" : "s")"
         } else if minutes > 0 {
-            return "\(minutes) min\(minutes == 1 ? "" : "s")"
+            return "\(minutes) \(full ? "minute" : "min")\(minutes == 1 ? "" : "s")"
         } else {
-            return "<1 min"
+            return "<1 \(full ? "minute" : "min")"
         }
     }
 }