felixfoertsch/workoutsplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ExerciseTemplate conecpt, fix UI elements

Browse Source
This commit is contained in:
Felix Förtsch
2024-08-25 23:20:56 +02:00
parent 71719c1f1b
commit 19e91d75e0
12 changed files with 181 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
WorkoutsPlus/Exercise/ExerciseLibrary.swift
View File

@@ -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()
}