introduce WorkoutItem, refactor ExerciseTemplate to Exercise

This commit is contained in:
Felix Förtsch
2024-09-02 17:17:11 +02:00
parent 22b0ba372e
commit 8e1d3306b9
13 changed files with 149 additions and 142 deletions
+22 -22
View File
@@ -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)
}