Logging

Workout Spinner WatchKit App/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>376</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Workout Spinner WatchKit Extension/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>376</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CLKComplicationPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
 	<key>CLKComplicationSupportedFamilies</key>

Workout Spinner WatchKit Extension/Logging/Logger.swift

@@ -0,0 +1,33 @@
+//
+//  Logger.swift
+//  Workout Spinner WatchKit Extension
+//
+//  Created by Joshua on 12/10/20.
+//  Copyright © 2020 Joshua Cook. All rights reserved.
+//
+
+import Foundation
+import os
+
+extension Logger {
+    static let mySubsystem = "com.joshuacook.Workout-Spinner"
+
+    // MARK: - Model loggers
+
+    static let workoutManagerLogger = Logger(subsystem: Logger.mySubsystem, category: "workout-manager")
+    static let exerciseOptionsLogger = Logger(subsystem: Logger.mySubsystem, category: "exercise-options")
+    static let heartRateGraphLogger = Logger(subsystem: Logger.mySubsystem, category: "heart-rate-graph")
+
+    // MARK: - View loggers
+
+    static let welcomeViewLogger = Logger(subsystem: Logger.mySubsystem, category: "welcome-view")
+    static let workoutPagingViewLogger = Logger(subsystem: Logger.mySubsystem, category: "workout-paging-view")
+    static let exercisePickerLogger = Logger(subsystem: Logger.mySubsystem, category: "exercise-picker")
+    static let workoutFinishViewLogger = Logger(subsystem: Logger.mySubsystem, category: "workout-finish-view")
+    static let heartRateGraphViewLogger = Logger(subsystem: Logger.mySubsystem, category: "heart-rate-graph-view")
+
+    // MARK: - Settings
+
+    static let settingsLogger = Logger(subsystem: Logger.mySubsystem, category: "settings")
+    static let editExercisesViewLogger = Logger(subsystem: Logger.mySubsystem, category: "settings-edit-exercise-view")
+}

Workout Spinner WatchKit Extension/Models/ExerciseInfo.swift

@@ -15,6 +15,13 @@ struct ExerciseInfo: Identifiable, Codable, Equatable {
     let bodyParts: [ExerciseBodyPart]
     let workoutValue: [String: Float]
     var active: Bool = true
+    var shortDescription: String {
+        "\(displayName) (\(id))"
+    }
+
+    var longDescription: String {
+        "\(id). \(displayName) - type: \(type.rawValue), num bodyparts: \(bodyParts.count), active: \(active)"
+    }
 
     static func == (lhs: ExerciseInfo, rhs: ExerciseInfo) -> Bool {
         return lhs.id == rhs.id

Workout Spinner WatchKit Extension/Models/ExerciseOptions.swift

@@ -7,8 +7,10 @@
 //
 
 import Foundation
+import os
 
 class ExerciseOptions: NSObject, ObservableObject {
+    let logger = Logger.exerciseOptionsLogger
     @Published var allExercises = [ExerciseInfo]()
 
     var exercises: [ExerciseInfo] {
@@ -29,26 +31,32 @@ class ExerciseOptions: NSObject, ObservableObject {
 
     /// Write exercise array to disk.
     func saveExercises() {
+        logger.info("Saving exercises.")
         let encoder = JSONEncoder()
         do {
             let encodedExercises = try encoder.encode(allExercises)
             UserDefaults.standard.set(encodedExercises, forKey: UserDefaultsKeys.exerciseOptions.rawValue)
+            logger.log("Finished saving exercises.")
         } catch {
-            print("Error when encoding exercises to JSON: \(error.localizedDescription)")
+            logger.error("Error when encoding exercises to JSON: \(error.localizedDescription, privacy: .public)")
         }
+        logger.log("Finished saving exercises.")
     }
 
     /// Read in exercise array from disk.
     /// - Returns: Array of exercises.
     func loadExercises() -> [ExerciseInfo] {
+        logger.info("Loading exercises.")
         if let codedExercises = UserDefaults.standard.object(forKey: UserDefaultsKeys.exerciseOptions.rawValue) as? Data {
             do {
                 let decodedExercises = try JSONDecoder().decode([ExerciseInfo].self, from: codedExercises)
+                logger.log("Loaded \(decodedExercises.count) exercises.")
                 return decodedExercises
             } catch {
-                print("Unable to decode exercises: \(error.localizedDescription)")
+                logger.error("Unable to decode exercises: \(error.localizedDescription, privacy: .public)")
             }
         }
+        logger.log("Did not load any exercises.")
         return []
     }
 
@@ -72,12 +80,14 @@ class ExerciseOptions: NSObject, ObservableObject {
 extension ExerciseOptions {
     /// Add a new exercise.
     func append(_ exercise: ExerciseInfo) {
+        logger.debug("Adding new exercise: \(exercise.shortDescription, privacy: .public)")
         allExercises.append(exercise)
         saveExercises()
     }
 
     /// Replace one exercise with another.
     func replace(_ exercise: ExerciseInfo, with newExercise: ExerciseInfo) {
+        logger.debug("Replacing exercise: \(newExercise.shortDescription, privacy: .public) replacing \(exercise.shortDescription, privacy: .public)")
         if let idx = allExercises.firstIndex(where: { $0 == exercise }) {
             allExercises[idx] = newExercise
             saveExercises()
@@ -86,6 +96,7 @@ extension ExerciseOptions {
 
     /// Remove an exercise.
     func remove(_ exercise: ExerciseInfo) {
+        logger.debug("Removing exercise: \(exercise.shortDescription)")
         let startCount = allExercises.count
         allExercises = exercises.filter { $0 == exercise }
         if startCount != allExercises.count {
@@ -95,6 +106,7 @@ extension ExerciseOptions {
 
     /// Remove multiple exercises.
     func remove(_ exercisesToRemove: [ExerciseInfo]) {
+        logger.debug("Removing \(exercisesToRemove.count) exercises.")
         if exercisesToRemove.count == 0 { return }
         let startCount = allExercises.count
         for exercise in exercisesToRemove {
@@ -107,6 +119,7 @@ extension ExerciseOptions {
 
     /// Update an existing exercise or append it to the end of the options.
     func updateOrAppend(_ exercise: ExerciseInfo) {
+        logger.debug("Updating or adding (as necessary) exercise: \(exercise.shortDescription, privacy: .public)")
         if let idx = allExercises.firstIndex(where: { $0 == exercise }) {
             allExercises[idx] = exercise
         } else {
@@ -117,11 +130,12 @@ extension ExerciseOptions {
 
     /// Resest the list of exercises to default options.
     func resetExerciseOptions() {
+        logger.log("Reseting exercise options to defaults.")
         do {
             allExercises = try parse(jsonData: readLocalJsonFile(named: "WorkoutSpinnerExercises"))
             saveExercises()
         } catch {
-            print("error in loading workouts: \(error.localizedDescription)")
+            logger.error("Error in loading workouts: \(error.localizedDescription, privacy: .public)")
         }
     }
 }

Workout Spinner WatchKit Extension/Models/HeartRateGraphData.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import os
 
 struct HeartRateGraphDatum {
     let x: Double
@@ -16,6 +17,7 @@ struct HeartRateGraphDatum {
 
 struct HeartRateGraphData {
     var data: [HeartRateGraphDatum]
+    var logger = Logger.heartRateGraphLogger
 
     var minX: Double {
         return data.map { $0.x }.min()!
@@ -34,8 +36,8 @@ struct HeartRateGraphData {
     }
 
     init(workoutTraker: WorkoutTracker) {
+        logger.info("Heart rate graph initialized with workout tracker (\(workoutTraker.numberOfExercises) exercise(s))")
         data = HeartRateGraphData.workoutTrackerDataToGraphData(workoutTraker)
-//        self.data = HeartRateGraphData.mockHeartRateData()
     }
 
     static func workoutTrackerDataToGraphData(_ workoutTracker: WorkoutTracker) -> [HeartRateGraphDatum] {
@@ -71,19 +73,21 @@ struct HeartRateGraphData {
     }
 }
 
-extension HeartRateGraphData {
-    static func mockHeartRateData() -> [HeartRateGraphDatum] {
-        var d = [HeartRateGraphDatum]()
-        var x = 0.0
-        for i in 0 ..< 5 {
-            let n = (5 ... 25).randomElement()!
-            var y = 50.0
-            for _ in 0 ..< n {
-                x += 1
-                y += Double.random(in: -5.0 ... 5.0)
-                d.append(HeartRateGraphDatum(x: x, y: y, groupIndex: i))
+#if DEBUG
+    extension HeartRateGraphData {
+        static func mockHeartRateData() -> [HeartRateGraphDatum] {
+            var d = [HeartRateGraphDatum]()
+            var x = 0.0
+            for i in 0 ..< 5 {
+                let n = (5 ... 25).randomElement()!
+                var y = 50.0
+                for _ in 0 ..< n {
+                    x += 1
+                    y += Double.random(in: -5.0 ... 5.0)
+                    d.append(HeartRateGraphDatum(x: x, y: y, groupIndex: i))
+                }
             }
+            return d
         }
-        return d
     }
-}
+#endif