introduce WorkoutItem, refactor ExerciseTemplate to Exercise

WorkoutsPlus/Exercise/AddExercise.swift

@@ -11,16 +11,16 @@ struct AddExercise: View {
 		@Environment(\.modelContext) private var modelContext
 		@Environment(\.dismiss) private var dismiss
 		
-		@Bindable var exerciseTemplate: ExerciseTemplate
+		@Bindable var exercise: Exercise
 		
 		var body : some View {
 				Form {
-						TextField("Workout Name", text: $exerciseTemplate.name)
+						TextField("Workout Name", text: $exercise.name)
 				}
 				.toolbar {
 						ToolbarItem(placement: .cancellationAction) {
 								Button("Cancel") {
-										modelContext.delete(exerciseTemplate)
+										modelContext.delete(exercise)
 										dismiss()
 								}
 						}
@@ -36,6 +36,6 @@ struct AddExercise: View {
 #Preview {
 		Color.clear
 				.sheet(isPresented: .constant(true)) {
-						AddExercise(exerciseTemplate: ExerciseTemplate(""))
+						AddExercise(exercise: Exercise(""))
 				}
 }

WorkoutsPlus/Exercise/Exercise.swift

@@ -2,48 +2,33 @@
 //  Exercise.swift
 //  WorkoutsPlus
 //
-//  Created by Felix Förtsch on 10.08.24.
+//  Created by Felix Förtsch on 25.08.24.
 //
 
 import Foundation
 import SwiftData
 
 @Model
-final class Exercise: Identifiable {
-		var id = UUID()
-		var name: String
+final class Exercise {
+		static var systemImage = "figure.run"
+		@Attribute(.unique) var name: String
+		var metric: String = "reps"
+		//		var exerciseDescription: ExerciseDescription?
 		
-		var workout: Workout?
-		var position: Int = 0
+		var timestamp: Date = Date.now
 		
-		var exerciseTemplate: ExerciseTemplate? {
-				didSet {
-						self.name = exerciseTemplate?.name ?? "self.name"
-				}
-		}
-		var reps: Int = 0
-		
-		init(_ reps: Int, _ exercise: String) {
-				self.name = exercise
-				self.reps = reps
-				self.exerciseTemplate = ExerciseTemplate(exercise)
+		init(_ name: String = "") {
+				self.name = name
 		}
 		
-		// 8x Dips
-		init(from exerciseTemplate: ExerciseTemplate) {
-				self.name = exerciseTemplate.name
-				self.exerciseTemplate = exerciseTemplate
-		}
-}
-
-extension Exercise {
-		static let sampleData: [Exercise] = {
-				var exercises = [Exercise]()
-				
-				for exerciseTemplate in ExerciseTemplate.sampleData {
-						exercises.append(Exercise(from: exerciseTemplate))
-				}
-				
-				return exercises
-		}()
+		static let sampleData: [Exercise] = [
+				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")
+		]
 }

WorkoutsPlus/Exercise/ExerciseDetail.swift

@@ -11,12 +11,12 @@ struct ExerciseDetail: View {
 		@Environment(\.dismiss) private var dismiss
 		@Environment(\.modelContext) private var modelContext
 		
-		@Bindable var exerciseTemplate: ExerciseTemplate
+		@Bindable var exercise: Exercise
 		
 		var body: some View {
 				
 				Form {
-						TextField("Exercise Name", text: $exerciseTemplate.name)
+						TextField("Exercise Name", text: $exercise.name)
 								.toolbar {
 										ToolbarItem(placement: .topBarTrailing) {
 												Button("Save") {
@@ -41,5 +41,5 @@ struct ExerciseDetail: View {
 }
 
 #Preview {
-		ExerciseDetail(exerciseTemplate: ExerciseTemplate.sampleData.first!)
+		ExerciseDetail(exercise: Exercise.sampleData.first!)
 }

WorkoutsPlus/Exercise/ExerciseLibrary.swift

@@ -10,19 +10,19 @@ import SwiftData
 
 struct ExerciseLibrary: View {
 		@Environment(\.modelContext) private var modelContext
-		@Query(sort: \ExerciseTemplate.name) private var exerciseTemplates: [ExerciseTemplate]
+		@Query(sort: \Exercise.name) private var exercises: [Exercise]
 		
-		@State private var newExerciseTemplate: ExerciseTemplate = ExerciseTemplate("")
+		@State private var newExercise: Exercise = Exercise("")
 		@State private var newExerciseName: String = ""
-		@State private var isAddingExerciseTemplate: Bool = false
+		@State private var isAddingExercise: Bool = false
 		@FocusState private var isInputFieldFocused: Bool
 		
 		@State private var searchText: String = ""
-		var filteredItems: [ExerciseTemplate] {
+		var filteredItems: [Exercise] {
 				if searchText.isEmpty {
-						return exerciseTemplates
+						return exercises
 				} else {
-						return exerciseTemplates.filter { $0.name.localizedCaseInsensitiveContains(searchText) }
+						return exercises.filter { $0.name.localizedCaseInsensitiveContains(searchText) }
 				}
 		}
 		
@@ -32,24 +32,24 @@ struct ExerciseLibrary: View {
 				NavigationView {
 						Group {
 								List {
-										ForEach(filteredItems) { exerciseTemplate in
+										ForEach(filteredItems) { exercise in
 												NavigationLink {
-														ExerciseDetail(exerciseTemplate: exerciseTemplate)
+														ExerciseDetail(exercise: exercise)
 												} label: {
-														Text(exerciseTemplate.name)
+														Text(exercise.name)
 												}
 										}
 										.onDelete(perform: deleteExercise)
-										if isAddingExerciseTemplate {
+										if isAddingExercise {
 												TextField("New Exercise", text: $newExerciseName, onCommit: {
-														newExerciseTemplate.name = newExerciseName
-														saveExercise(exerciseTemplate: newExerciseTemplate)
-														isAddingExerciseTemplate = false
+														newExercise.name = newExerciseName
+														save(exercise: newExercise)
+														isAddingExercise = false
 												})
 												.textInputAutocapitalization(.words)
 												.focused($isInputFieldFocused)
 										}
-										AddItemButton(label: "Exercise", action: addExerciseTemplate)
+										AddItemButton(label: "Exercise", action: addExercise)
 								}
 								.searchable(text: $searchText)
 						}
@@ -62,18 +62,18 @@ struct ExerciseLibrary: View {
 				}
 		}
 		
-		private func addExerciseTemplate() {
+		private func addExercise() {
 				withAnimation {
-						newExerciseTemplate = ExerciseTemplate("")
+						newExercise = Exercise("")
 						newExerciseName = ""
-						isAddingExerciseTemplate = true
+						isAddingExercise = true
 						isInputFieldFocused = true
 				}
 		}
 		
-		private func saveExercise(exerciseTemplate: ExerciseTemplate) {
-				if !exerciseTemplate.name.isEmpty {
-						modelContext.insert(exerciseTemplate)
+		private func save(exercise: Exercise) {
+				if !exercise.name.isEmpty {
+						modelContext.insert(exercise)
 						try? modelContext.save()
 				}
 		}
@@ -81,7 +81,7 @@ struct ExerciseLibrary: View {
 		private func deleteExercise(offsets: IndexSet) {
 				withAnimation {
 						for index in offsets {
-								modelContext.delete(exerciseTemplates[index])
+								modelContext.delete(exercises[index])
 						}
 						try? modelContext.save()
 				}
@@ -95,6 +95,6 @@ struct ExerciseLibrary: View {
 
 #Preview("Empty Database") {
 		ExerciseLibrary()
-				.modelContainer(for: Exercise.self, inMemory: true)
+				.modelContainer(for: WorkoutItem.self, inMemory: true)
 }
 

WorkoutsPlus/Exercise/ExerciseTemplate.swift

@@ -1,34 +0,0 @@
-//
-//  ExerciseTemplate.swift
-//  WorkoutsPlus
-//
-//  Created by Felix Förtsch on 25.08.24.
-//
-
-import Foundation
-import SwiftData
-
-@Model
-final class ExerciseTemplate {
-		static var systemImage = "figure.run"
-		@Attribute(.unique) var name: String
-		var metric: String = "reps"
-		//		var exerciseDescription: ExerciseDescription?
-		
-		var timestamp: Date = Date.now
-		
-		init(_ name: String = "") {
-				self.name = name
-		}
-		
-		static let sampleData: [ExerciseTemplate] = [
-				ExerciseTemplate("Dips"),
-				ExerciseTemplate("Chin-ups"),
-				ExerciseTemplate("Push-ups"),
-				ExerciseTemplate("Inverted Rows"),
-				ExerciseTemplate("Hanging Knee Raises"),
-				ExerciseTemplate("Pistol Squats"),
-				ExerciseTemplate("Hanging Leg Curls"),
-				ExerciseTemplate("Sissy Squats")
-		]
-}