add ExerciseTemplate conecpt, fix UI elements

WorkoutsPlus/Exercise/AddExercise.swift

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

WorkoutsPlus/Exercise/Exercise.swift

@@ -1,5 +1,5 @@
 //
-//  Item.swift
+//  Exercise.swift
 //  WorkoutsPlus
 //
 //  Created by Felix Förtsch on 10.08.24.
@@ -9,24 +9,34 @@ import Foundation
 import SwiftData
 
 @Model
-final class Exercise {
-		@Attribute(.unique) var name: String
-		static var systemImage = "figure.run"
+class Exercise {
+		var name: String
 		
-		var timestamp: Date
+		var exerciseTemplate: ExerciseTemplate? {
+				didSet {
+						self.name = exerciseTemplate?.name ?? "self.name"
+				}}
+		var reps: Int = 0
 		
-		init(_ name: String = "", timestamp: Date = Date.now) {
-				self.name = name
-				self.timestamp = timestamp
+		init(_ reps: Int, _ exercise: String) {
+				self.name = exercise
+				self.reps = reps
+				self.exerciseTemplate = ExerciseTemplate(exercise)
 		}
 		
-		static let sampleData: [Exercise] = [
-				Exercise("Warm-up"), Exercise("Pull-up Progression"), Exercise("Squat Progression"),
-				Exercise("Dip Progression"), Exercise("Hinge Progression"), Exercise("Row Progression"),
-				Exercise("Push-up Progression"), Exercise("Core Triplet"), Exercise("Push"), Exercise("Pull"),
-				Exercise("Legs"), Exercise("Core"), 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"),
-				Exercise("400 m schnell"), Exercise("200 m langsam")
-		]
+		// 8x Dips
+		init(from exerciseTemplate: ExerciseTemplate) {
+				self.name = exerciseTemplate.name
+				self.exerciseTemplate = exerciseTemplate
+		}
+		
+		static let sampleData: [Exercise] = {
+				var exercises = [Exercise]()
+				
+				for exerciseTemplate in ExerciseTemplate.sampleData {
+						exercises.append(Exercise(from: exerciseTemplate))
+				}
+				
+				return exercises
+		}()
 }

WorkoutsPlus/Exercise/ExerciseDetail.swift

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

WorkoutsPlus/Exercise/ExerciseLibrary.swift

@@ -10,29 +10,29 @@ import SwiftData
 
 struct ExerciseLibrary: View {
 		@Environment(\.modelContext) private var modelContext
-		@Query(sort: \Exercise.name) private var exercises: [Exercise]
+		@Query(sort: \ExerciseTemplate.name) private var exerciseTemplates: [ExerciseTemplate]
 		
-		@State private var newExercise: Exercise?
+		@State private var newExercise: ExerciseTemplate?
 		
 		// TODO: Add search bar to the top
 		
 		var body: some View {
 				NavigationSplitView {
 						Group {
-								if !exercises.isEmpty {
+								if !exerciseTemplates.isEmpty {
 										List {
-												ForEach(exercises) { exercise in
+												ForEach(exerciseTemplates) { exerciseTemplate in
 														NavigationLink {
-																ExerciseDetail(exercise: exercise)
+																ExerciseDetail(exerciseTemplate: exerciseTemplate)
 														} label: {
-																Text(exercise.name)
+																Text(exerciseTemplate.name)
 														}
 												}
 												.onDelete(perform: deleteExercise)
 										}
 								} else {
 										ContentUnavailableView {
-												Label("No Exercises", systemImage: Exercise.systemImage)
+												Label("No Exercises", systemImage: ExerciseTemplate.systemImage)
 										}
 								}
 						}
@@ -49,7 +49,7 @@ struct ExerciseLibrary: View {
 						}
 						.sheet(item: $newExercise) { exercise in
 								NavigationStack {
-										AddExercise(exercise: exercise)
+										AddExercise(exerciseTemplate: exercise)
 								}
 								// TODO: It's possible to add a boolean here ("Terms accepted y/n"). Maybe add this for empty string
 								.presentationDetents([.medium])
@@ -64,15 +64,15 @@ struct ExerciseLibrary: View {
 		
 		private func addExercise() {
 				withAnimation {
-						let item = Exercise("")
+						let item = ExerciseTemplate("")
 						modelContext.insert(item)
 						newExercise = item
 				}
 		}
 		
-		private func saveExercise(exercise: Exercise) {
-				if !exercise.name.isEmpty {
-						modelContext.insert(exercise)
+		private func saveExercise(exerciseTemplate: ExerciseTemplate) {
+				if !exerciseTemplate.name.isEmpty {
+						modelContext.insert(exerciseTemplate)
 						try? modelContext.save()
 				}
 		}
@@ -80,7 +80,7 @@ struct ExerciseLibrary: View {
 		private func deleteExercise(offsets: IndexSet) {
 				withAnimation {
 						for index in offsets {
-								modelContext.delete(exercises[index])
+								modelContext.delete(exerciseTemplates[index])
 						}
 						try? modelContext.save()
 				}

WorkoutsPlus/Exercise/ExerciseTemplate.swift

@@ -0,0 +1,33 @@
+//
+//  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"
+		var name: String
+		//		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")
+		]
+}