clean up ActiveWorkoutSession

WorkoutsPlus/Features/Exercise/Exercise.swift

@@ -26,53 +26,42 @@ final class Exercise: Nameable {
 		@Attribute(.unique) var name: String
 		var exerciseDescription = ""
 		
-		var metric = ExerciseMetric.none
-		var unit: ExerciseUnit
+		var type: ExerciseType?
+		var unit: ExerciseUnit?
 		
 		var isPartOfProgression = false
 		
 		var equipment: [Equipment] = []
 		
-		init(_ name: String, _ metric: ExerciseMetric = .none) {
+		init(_ name: String) {
 				self.name = name
-				self.metric = metric
-				self.unit = ExerciseUnit(name: "Meters", symbol: "m")
 		}
 }
 
-enum ExerciseMetric: String, Codable, CaseIterable, Identifiable {
-		case none = ""
-		case distance = "Distance"
-		case time = "Time"
-		case weight = "Weight"
-		
-		var id: Self { self }
-}
-
 extension Exercise {
 		static let sampleDataRecommendedRoutine: [Exercise] = [
 				Exercise("Shoulder Band Warm-up"),
 				Exercise("Squat Sky Reaches"),
-				Exercise("GMB Wrist Prep", .time),
+				Exercise("GMB Wrist Prep"),
 				Exercise("Dead Bugs"),
-				Exercise("Pull-up Progression", .weight),
-				Exercise("Dip Progression", .weight),
-				Exercise("Squat Progression", .weight),
-				Exercise("Hinge Progression", .weight),
-				Exercise("Row Progression", .weight),
-				Exercise("Push-up Progression", .weight),
-				Exercise("Handstand Practice", .time),
-				Exercise("Support Practice", .time)
+				Exercise("Pull-up Progression"),
+				Exercise("Dip Progression"),
+				Exercise("Squat Progression"),
+				Exercise("Hinge Progression"),
+				Exercise("Row Progression"),
+				Exercise("Push-up Progression"),
+				Exercise("Handstand Practice"),
+				Exercise("Support Practice")
 		]
 		
 		static let sampleDataRings: [Exercise] = [
-				Exercise("Dips", .weight),
-				Exercise("Chin-ups", .weight),
-				Exercise("Push-ups", .weight),
-				Exercise("Inverted Rows", .weight),
-				Exercise("Hanging Knee Raises", .weight),
-				Exercise("Pistol Squats", .weight),
-				Exercise("Hanging Leg Curls", .weight),
+				Exercise("Dips"),
+				Exercise("Chin-ups"),
+				Exercise("Push-ups"),
+				Exercise("Inverted Rows"),
+				Exercise("Hanging Knee Raises"),
+				Exercise("Pistol Squats"),
+				Exercise("Hanging Leg Curls"),
 				Exercise("Sissy Squats")
 		]