From 7b67d85b9c10274b587b4e7e552d2ab1ab72c64e Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 9 Jun 2024 09:58:57 -0500 Subject: [PATCH] WIP --- Werkout_ios/APIModels/Exercise.swift | 8 ++++++++ Werkout_ios/Views/AddExercise/AddExerciseView.swift | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Werkout_ios/APIModels/Exercise.swift b/Werkout_ios/APIModels/Exercise.swift index e9d4605..f1af8b0 100644 --- a/Werkout_ios/APIModels/Exercise.swift +++ b/Werkout_ios/APIModels/Exercise.swift @@ -81,4 +81,12 @@ struct Exercise: Identifiable, Codable, Equatable { } return name } + + var spacedMuscleGroups: String { + return muscleGroups.replacingOccurrences(of: ",", with: ", ") + } + + var spacedEquipmentRequired: String { + return equipmentRequired.replacingOccurrences(of: ",", with: ", ") + } } diff --git a/Werkout_ios/Views/AddExercise/AddExerciseView.swift b/Werkout_ios/Views/AddExercise/AddExerciseView.swift index b2a5193..874be59 100644 --- a/Werkout_ios/Views/AddExercise/AddExerciseView.swift +++ b/Werkout_ios/Views/AddExercise/AddExerciseView.swift @@ -215,7 +215,7 @@ struct AddExerciseView: View { List() { ForEach(filteredExercises.indices, id: \.self) { i in let exercise = filteredExercises[i] - if searchString.isEmpty || exercise.name.lowercased().contains(searchString.lowercased()) { + if searchString.isEmpty || (exercise.name.lowercased().contains(searchString.lowercased()) || exercise.muscleGroups.lowercased().contains(searchString.lowercased())) { HStack { VStack { Text(exercise.name) @@ -228,13 +228,13 @@ struct AddExerciseView: View { } if !exercise.equipmentRequired.isEmpty { - Text(exercise.equipmentRequired) + Text(exercise.spacedEquipmentRequired) .font(.footnote) .frame(maxWidth: .infinity, alignment: .leading) } if !exercise.muscleGroups.isEmpty { - Text(exercise.muscleGroups) + Text(exercise.spacedMuscleGroups) .font(.footnote) .frame(maxWidth: .infinity, alignment: .leading) }