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

add UI for adding exercises to workouts

Browse Source
This commit is contained in:
Felix Förtsch
2024-08-22 14:55:59 +02:00
parent 419e2bc699
commit 71719c1f1b
7 changed files with 154 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
WorkoutsPlus/Exercise/Exercise.swift
View File

@@ -10,7 +10,7 @@ import SwiftData
@Model
final class Exercise {
var name: String
@Attribute(.unique) var name: String
static var systemImage = "figure.run"
var timestamp: Date
@@ -20,11 +20,13 @@ final class Exercise {
self.timestamp = timestamp
}
static let sampleData = [
Exercise("Pull-up"),
Exercise("Push-up"),
Exercise("Dips"),
Exercise("Rows"),
Exercise("Split Squat")
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")
]
}

3
WorkoutsPlus/Exercise/ExerciseLibrary.swift
View File

@@ -14,6 +14,8 @@ struct ExerciseLibrary: View {
@State private var newExercise: Exercise?
// TODO: Add search bar to the top
var body: some View {
NavigationSplitView {
Group {
@@ -50,6 +52,7 @@ struct ExerciseLibrary: View {
AddExercise(exercise: exercise)
}
// TODO: It's possible to add a boolean here ("Terms accepted y/n"). Maybe add this for empty string
.presentationDetents([.medium])
.interactiveDismissDisabled()
}
} detail: {

12
WorkoutsPlus/SampleData.swift
View File

@@ -31,11 +31,19 @@ class SampleData {
}
func insertSampleData() {
// Erstellt ein Dictionary, um Übungen nach Namen nachzuschlagen
var exercisesDict = [String: Exercise]()
// Alle Übungen in der Datenbank speichern und im Dictionary ablegen
for exercise in Exercise.sampleData {
context.insert(exercise)
if exercisesDict[exercise.name] == nil {
context.insert(exercise)
exercisesDict[exercise.name] = exercise
}
}
for workout in Workout.sampleData {
// Workouts erstellen und dabei vorhandene Übungen referenzieren
for workout in Workout.sampleData(using: exercisesDict) {
context.insert(workout)
}

84
WorkoutsPlus/Workout/AddExerciseToWorkout.swift Normal file
View File

@@ -0,0 +1,84 @@
//
// AddExerciseToWorkout.swift
// WorkoutsPlus
//
// Created by Felix Förtsch on 22.08.24.
//
import SwiftUI
import SwiftData
struct AddExerciseToWorkout: View {
@Environment(\.modelContext) private var modelContext
@Query(sort: \Exercise.name) private var exercises: [Exercise]
@Bindable var workout: Workout
var selectedExercises: [Exercise] = [Exercise("Selected")]
var body: some View {
Group {
if !exercises.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)
}
}
}
} else {
ContentUnavailableView {
// TODO: Add Button that allows adding an exercise
Label("No Exercises", systemImage: Exercise.systemImage)
}
}
}
}
}
struct AddExerciseToWorkoutListItem: View {
var exercise: Exercise
var workout: Workout
init(_ exercise: Exercise, _ workout: Workout) {
self.exercise = exercise
self.workout = workout
}
var body: some View {
Button(action: {
workout.addExercise(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: "plus.circle.fill")
.foregroundColor(.green)
}
}
}
}
#Preview("With Sample Data") {
AddExerciseToWorkout(workout: Workout(name: "New Workout"))
.modelContainer(SampleData.shared.modelContainer)
}
#Preview("Empty Database") {
AddExerciseToWorkout(workout: Workout(name: "New Workout"))
.modelContainer(for: Exercise.self, inMemory: true)
}

51
WorkoutsPlus/Workout/Workout.swift
View File

@@ -37,27 +37,32 @@ final class Workout {
exercises.append(exercise)
}
static let sampleData = [
Workout(name: "RR", exercises: [
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 Trilet")]),
Workout(name: "Minimalist", exercises:[
Exercise("Push"), Exercise("Pull"),
Exercise("Legs"), Exercise("Core")]),
Workout(name: "Rings", exercises: [
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")]),
Workout(name: "Intervalltraining", exercises: [
Exercise("400 m schnell"), Exercise("200 m langsam"),
Exercise("400 m schnell"), Exercise("200 m langsam"),
Exercise("400 m schnell"), Exercise("200 m langsam"),
Exercise("400 m schnell"), Exercise("200 m langsam"),
Exercise("400 m schnell"), Exercise("200 m langsam"),
Exercise("400 m schnell"), Exercise("200 m langsam")])
]
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"]!
])
]
}
}

19
WorkoutsPlus/Workout/WorkoutDetail.swift
View File

@@ -13,6 +13,7 @@ struct WorkoutDetail: View {
@Environment(\.modelContext) private var modelContext
@Bindable var workout: Workout
@State private var isPresenting = false
var body: some View {
@@ -26,6 +27,9 @@ struct WorkoutDetail: View {
Text(exercise.name)
}
}
Button(action: addExerciseToWorkout) {
Text("Add")
}
}
}
.navigationBarTitle("Edit \(workout.name)")
@@ -36,6 +40,19 @@ struct WorkoutDetail: View {
}
}
}
.sheet(isPresented: $isPresenting) {
NavigationStack {
AddExerciseToWorkout(workout: workout)
}
.presentationDetents([.medium, .large])
.presentationDragIndicator(.visible)
}
}
private func addExerciseToWorkout() {
withAnimation {
isPresenting = true
}
}
private func saveWorkout() {
@@ -51,7 +68,7 @@ struct WorkoutDetail: View {
#Preview {
NavigationStack {
WorkoutDetail(workout: Workout.sampleData[0])
WorkoutDetail(workout: Workout(name: "RR"))
.modelContainer(SampleData.shared.modelContainer)
}
}

3
WorkoutsPlus/Workout/WorkoutLibrary.swift
View File

@@ -34,7 +34,7 @@ struct WorkoutLibrary: View {
}
}
}
.navigationBarTitle("Workouts")
.navigationBarTitle("Workout Templates")
.toolbar {
ToolbarItem(placement: .topBarLeading) {
EditButton()
@@ -49,6 +49,7 @@ struct WorkoutLibrary: View {
NavigationStack {
AddWorkout(workout: workout)
}
.presentationDetents([.medium])
.interactiveDismissDisabled()
}
} detail: {