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
WorkoutsPlus/Workout/AddExerciseToWorkout.swift
+15 -28
View File
@@ -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)
}
WorkoutsPlus/Workout/AddWorkout.swift
+1 -1
View File
@@ -36,6 +36,6 @@ struct AddWorkout: View {
#Preview {
Color.clear
.sheet(isPresented: .constant(true)) {
AddWorkout(workout: Workout(name: ""))
AddWorkout(workout: Workout.sampleData.first!)
}
}
WorkoutsPlus/Workout/Workout.swift
+18 -35
View File
@@ -1,5 +1,5 @@
//
// Item.swift
// Workout.swift
// WorkoutsPlus
//
// Created by Felix Förtsch on 10.08.24.
@@ -18,51 +18,34 @@ final class Workout {
static var systemImage = "figure.run.square.stack"
// Other properties and methods
var timestamp: Date
var timestamp: Date = Date.now
var exercises: [Exercise] = []
init(name: String = "", timestamp: Date = Date.now) {
init(name: String) {
self.name = name
self.timestamp = timestamp
}
private init(name: String, exercises: [Exercise]) {
init(name: String, exercises: [Exercise]) {
self.name = name
self.timestamp = Date.now
self.exercises = exercises
}
func addExercise(_ exercise: Exercise) {
exercises.append(exercise)
func addExercise(from exerciseTemplate: ExerciseTemplate) {
self.exercises.append(Exercise(from: exerciseTemplate))
}
static func sampleData(using exercisesDict: [String: Exercise]) -> [Workout] {
return [
Workout(name: "RR", exercises: [
exercisesDict["Warm-up"]!, exercisesDict["Pull-up Progression"]!,
exercisesDict["Squat Progression"]!, exercisesDict["Dip Progression"]!,
exercisesDict["Hinge Progression"]!, exercisesDict["Row Progression"]!,
exercisesDict["Push-up Progression"]!, exercisesDict["Core Triplet"]!
]),
Workout(name: "Minimalist", exercises: [
exercisesDict["Push"]!, exercisesDict["Pull"]!,
exercisesDict["Legs"]!, exercisesDict["Core"]!
]),
Workout(name: "Rings", exercises: [
exercisesDict["Dips"]!, exercisesDict["Chin-ups"]!,
exercisesDict["Push-ups"]!, exercisesDict["Inverted Rows"]!,
exercisesDict["Hanging Knee Raises"]!, exercisesDict["Pistol Squats"]!,
exercisesDict["Hanging Leg Curls"]!, exercisesDict["Sissy Squats"]!
]),
Workout(name: "Intervalltraining", exercises: [
exercisesDict["400 m schnell"]!, exercisesDict["200 m langsam"]!,
exercisesDict["400 m schnell"]!, exercisesDict["200 m langsam"]!,
exercisesDict["400 m schnell"]!, exercisesDict["200 m langsam"]!,
exercisesDict["400 m schnell"]!, exercisesDict["200 m langsam"]!,
exercisesDict["400 m schnell"]!, exercisesDict["200 m langsam"]!,
exercisesDict["400 m schnell"]!, exercisesDict["200 m langsam"]!
])
]
func addExercise(_ exercise: Exercise) {
self.exercises.append(exercise)
}
func addExercise(_ exercises: [Exercise]) {
for exercise in exercises {
self.exercises.append(exercise)
}
}
static let sampleData: [Workout] = [
Workout(name: "RR", exercises: Exercise.sampleData)
]
}
WorkoutsPlus/Workout/WorkoutDetail.swift
+53 -8
View File
@@ -24,20 +24,22 @@ struct WorkoutDetail: View {
Section(header: Text("Exercises")) {
List {
ForEach(workout.exercises) { exercise in
Text(exercise.name)
ExerciseListItem(workout, exercise)
}
.onDelete(perform: deleteExerciseFromWorkout)
.onMove(perform: move)
}
.environment(\.editMode, .constant(.active)) // Always active drag mode
Button(action: addExerciseToWorkout) {
Text("Add")
Text("Add Exercise")
}
}
}
.navigationBarTitle("Edit \(workout.name)")
.toolbar {
ToolbarItem(placement: .confirmationAction) {
Button("Done") {
dismiss()
}
ToolbarItem {
EditButton()
}
}
.sheet(isPresented: $isPresenting) {
@@ -64,11 +66,54 @@ struct WorkoutDetail: View {
}
}
}
private func deleteExerciseFromWorkout(offsets: IndexSet) {
withAnimation {
for index in offsets {
modelContext.delete(workout.exercises[index])
}
try? modelContext.save()
}
}
private func move(from source: IndexSet, to destination: Int) {
workout.exercises.move(fromOffsets: source, toOffset: destination)
}
}
struct ExerciseListItem: View {
var workout: Workout
var exercise: Exercise
init(_ workout: Workout, _ exercise: Exercise ) {
self.workout = workout
self.exercise = exercise
}
var body: some View {
Button(action: {
// workout.addExercise(from: exercise)
}) {
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)
.foregroundColor(.black)
Spacer()
Image(systemName: "info.circle")
}
}
}
}
#Preview {
NavigationStack {
WorkoutDetail(workout: Workout(name: "RR"))
.modelContainer(SampleData.shared.modelContainer)
WorkoutDetail(workout: Workout.sampleData.first!)
.modelContainer(SampleData.shared.modelContainer)
}
}