add ExerciseTemplate conecpt, fix UI elements
This commit is contained in:
@@ -10,32 +10,24 @@ import SwiftData
|
||||
|
||||
struct AddExerciseToWorkout: View {
|
||||
@Environment(\.modelContext) private var modelContext
|
||||
@Query(sort: \Exercise.name) private var exercises: [Exercise]
|
||||
@Query(sort: \ExerciseTemplate.name) private var exerciseTemplates: [ExerciseTemplate]
|
||||
|
||||
@Bindable var workout: Workout
|
||||
|
||||
var selectedExercises: [Exercise] = [Exercise("Selected")]
|
||||
|
||||
var body: some View {
|
||||
Group {
|
||||
if !exercises.isEmpty {
|
||||
if !exerciseTemplates.isEmpty {
|
||||
List {
|
||||
Section(header: Text("Utility")) {
|
||||
// TODO: Loop, Warm-up, Cool-down are not unique yet. They are special utility types
|
||||
AddExerciseToWorkoutListItem(Exercise("Loop"), workout)
|
||||
AddExerciseToWorkoutListItem(Exercise("Warm-up"),workout)
|
||||
AddExerciseToWorkoutListItem(Exercise("Cool-down"),workout)
|
||||
}
|
||||
Section(header: Text("Excersises")) {
|
||||
ForEach(exercises) { exercise in
|
||||
AddExerciseToWorkoutListItem(exercise, workout)
|
||||
ForEach(exerciseTemplates) { exerciseTemplate in
|
||||
AddExerciseToWorkoutListItem(exerciseTemplate, workout)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
ContentUnavailableView {
|
||||
// TODO: Add Button that allows adding an exercise
|
||||
Label("No Exercises", systemImage: Exercise.systemImage)
|
||||
Label("No Exercises", systemImage: ExerciseTemplate.systemImage)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -43,27 +35,22 @@ struct AddExerciseToWorkout: View {
|
||||
}
|
||||
|
||||
struct AddExerciseToWorkoutListItem: View {
|
||||
var exercise: Exercise
|
||||
@Environment(\.modelContext) private var modelContext
|
||||
|
||||
var exerciseTemplate: ExerciseTemplate
|
||||
var workout: Workout
|
||||
|
||||
init(_ exercise: Exercise, _ workout: Workout) {
|
||||
self.exercise = exercise
|
||||
init(_ exerciseTemplate: ExerciseTemplate, _ workout: Workout) {
|
||||
self.exerciseTemplate = exerciseTemplate
|
||||
self.workout = workout
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
Button(action: {
|
||||
workout.addExercise(exercise)
|
||||
workout.addExercise(from: exerciseTemplate)
|
||||
}) {
|
||||
HStack {
|
||||
Text(String(workout.exercises.filter { $0 == exercise }.count))
|
||||
.font(.system(size: 14, weight: .bold))
|
||||
.foregroundColor(.white)
|
||||
.frame(width: 20, height: 10)
|
||||
.padding(8)
|
||||
.background(Color.blue)
|
||||
.clipShape(RoundedRectangle(cornerRadius: 8))
|
||||
Text(exercise.name)
|
||||
Text(exerciseTemplate.name)
|
||||
.foregroundColor(.black)
|
||||
Spacer()
|
||||
Image(systemName: "plus.circle.fill")
|
||||
@@ -74,11 +61,11 @@ struct AddExerciseToWorkoutListItem: View {
|
||||
}
|
||||
|
||||
#Preview("With Sample Data") {
|
||||
AddExerciseToWorkout(workout: Workout(name: "New Workout"))
|
||||
AddExerciseToWorkout(workout: Workout.sampleData.first!)
|
||||
.modelContainer(SampleData.shared.modelContainer)
|
||||
}
|
||||
|
||||
#Preview("Empty Database") {
|
||||
AddExerciseToWorkout(workout: Workout(name: "New Workout"))
|
||||
.modelContainer(for: Exercise.self, inMemory: true)
|
||||
AddExerciseToWorkout(workout: Workout.sampleData.first!)
|
||||
.modelContainer(for: ExerciseTemplate.self, inMemory: true)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user