Add new step calculations and fix divide by zero

Author: liamcharger

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

@@ -35,6 +35,7 @@ struct StepCalendarView: View {
                             .frame(maxWidth: .infinity)
                     }
                 }
+                // FIXME: poor performance
                 LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: weekdays.count), spacing: 14) {
                     ForEach(fetchDates(), id: \.id) { value in
                         ZStack {

InfiniLink/Core/Components/DetailHeaderView.swift

@@ -29,29 +29,39 @@ struct DetailHeaderSubItemView: View {
     let title: String
     let value: String
     let unit: String?
+    let icon: (String, Color)?
 
-    init(title: String, value: String, unit: String? = nil) {
+    init(title: String, value: String, unit: String? = nil, icon: (String, Color)? = nil) {
         self.title = title
         self.value = value
         self.unit = unit
+        self.icon = icon
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 3) {
-            Text(title.uppercased())
-                .font(.caption)
-                .foregroundStyle(.gray)
-            HStack(alignment: .firstTextBaseline, spacing: 2) {
-                Text(value)
-                    .font(.system(size: 22).weight(.semibold))
-                if let unit {
-                    Text(unit)
-                        .font(.system(size: 17.5))
-                        .foregroundColor(.primary.opacity(0.75))
+        HStack(spacing: 9) {
+            if let name = icon?.0, let color = icon?.1 {
+                Image(systemName: name)
+                    .foregroundStyle(color)
+                    .font(.system(size: 21).weight(.medium))
+                    .frame(minWidth: 30)
+            }
+            VStack(alignment: .leading, spacing: 3) {
+                Text(title.uppercased())
+                    .font(.caption)
+                    .foregroundStyle(.gray)
+                HStack(alignment: .firstTextBaseline, spacing: 2) {
+                    Text(value)
+                        .font(.system(size: 22).weight(.semibold))
+                    if let unit {
+                        Text(unit)
+                            .font(.system(size: 17).weight(.medium))
+                            .foregroundColor(.primary.opacity(0.75))
+                    }
                 }
             }
+            Spacer()
         }
-        .frame(maxWidth: .infinity, alignment: .leading)
         .padding(12)
         .background(colorScheme == .dark ? AnyShapeStyle(Material.regular) : AnyShapeStyle(Color(.systemBackground)))
         .clipShape(RoundedRectangle(cornerRadius: 15))

InfiniLink/Core/StepsView.swift

@@ -19,9 +19,9 @@ struct StepsView: View {
 
     let exerciseCalculator = FitnessCalculator()
 
-    func steps(for date: Date) -> Int {
+    func steps() -> Int {
         for stepCount in chartManager.stepPoints() {
-            if Calendar.current.isDate(stepCount.timestamp!, inSameDayAs: date) {
+            if Calendar.current.isDate(stepCount.timestamp!, inSameDayAs: Date()) {
                 return Int(stepCount.steps)
             }
         }
@@ -40,12 +40,28 @@ struct StepsView: View {
         GeometryReader { geo in
             List {
                 Section {
-                    DetailHeaderView(Header(title: "\(steps(for: Date()))", subtitle: String(deviceManager.settings.stepsGoal), units: "Steps", icon: "figure.walk", accent: .blue), width: geo.size.width) {
-                        HStack {
-                            DetailHeaderSubItemView(title: "Dis",
-                                                    value: String(format: "%.2f", exerciseCalculator.calculateDistance(steps: steps(for: Date()))),
-                                                    unit: personalizationController.units == .imperial ? "mi" : "km")
-                            DetailHeaderSubItemView(title: "Kcal", value: String(exerciseCalculator.calculateCaloriesBurned(steps: steps(for: Date()))))
+                    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(steps: steps())
+                            
+                            DetailHeaderSubItemView(title: "Distance",
+                                                    value: String(format: "%.2f", distance),
+                                                    unit: units,
+                                                    icon: ("ruler", Color.blue))
+                            DetailHeaderSubItemView(title: "Kcal",
+                                                    value: String(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")",
+                                                    icon: ("stopwatch", Color.primary))
+                            DetailHeaderSubItemView(title: "Steps per \(unitsFull)",
+                                                    value: String(stepsPerUnit),
+                                                    unit: "step\(stepsPerUnit == 1 ? "" : "s")",
+                                                    icon: ("shoeprints.fill", Color.blue))
                         }
                     }
                     .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

InfiniLink/Utils/FitnessCalculator.swift

@@ -48,7 +48,7 @@ class FitnessCalculator {
     let personalizationController = PersonalizationController.shared
     let bleManager = BLEManager.shared
 
-    func calculateDistance(steps: Int, pace: FitnessCalculator.Pace = .avgWalk) -> Double {
+    func strideLength(pace: FitnessCalculator.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
@@ -69,7 +69,11 @@ class FitnessCalculator {
         }()
 
         let strideLength = baseStrideLength * strideMultiplier
-        var distance = strideLength * Double(steps)
+        return strideLength
+    }
+    
+    func calculateDistance(steps: Int, pace: FitnessCalculator.Pace = .avgWalk) -> Double {
+        var distance = strideLength(pace: pace) * Double(steps)
 
         if personalizationController.units == .imperial {
             distance /= 63360 // Convert inches to miles
@@ -85,6 +89,8 @@ class FitnessCalculator {
         let distance = calculateDistance(steps: steps, pace: pace)
         let timeMinutes = (distance / pace.milesPerHour) * 60.0
 
+        guard steps > 0, timeMinutes > 0 else { return 0 }
+        
         let spm = Double(steps) / timeMinutes
         return Int(ceil(spm))
     }
@@ -96,7 +102,19 @@ class FitnessCalculator {
         let calculatedWeight = personalizationController.units == .metric ? weight : (weight * 0.453592)
         let durationInHours = Double(steps) / Double(spm) / 60.0
 
+        guard durationInHours > 0 else { return 0 }
+        
         let caloriesBurned = Int(ceil(pace.metValue * calculatedWeight * durationInHours))
         return caloriesBurned
     }
+    
+    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 {
+        let unitInInches = personalizationController.units == .imperial ? 63360 : 39370.1
+        return Int(ceil(unitInInches / strideLength()))
+    }
 }