From b64ab4de136504530fa14d8552d515c2bf18d80e Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 25 Jun 2023 22:10:21 -0500 Subject: [PATCH] WIP --- .../Views/AddExercise/AddExerciseView.swift | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/Werkout_ios/Views/AddExercise/AddExerciseView.swift b/Werkout_ios/Views/AddExercise/AddExerciseView.swift index 26f0b03..0ac5201 100644 --- a/Werkout_ios/Views/AddExercise/AddExerciseView.swift +++ b/Werkout_ios/Views/AddExercise/AddExerciseView.swift @@ -151,7 +151,7 @@ struct AddExerciseView: View { if let muscles = DataStore.shared.allMuscles { var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]() muscles.forEach({ - let model = CreateWorkoutItemPickerModel(id: $0.id, name: $0.name) + let model = CreateWorkoutItemPickerModel(id: $0.id, name: $0.name.lowercased()) createWorkoutItemPickerModels.append(model) }) createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: { @@ -177,7 +177,7 @@ struct AddExerciseView: View { var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]() equipment.forEach({ let model = CreateWorkoutItemPickerModel(id: $0.id, - name: $0.name ?? "-") + name: $0.name?.lowercased() ?? "-") createWorkoutItemPickerModels.append(model) }) createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: { @@ -195,25 +195,35 @@ struct AddExerciseView: View { ForEach(filteredExercises.indices, id: \.self) { i in let obj = filteredExercises[i] if searchString.isEmpty || obj.name.lowercased().contains(searchString.lowercased()) { - VStack { - Text(obj.name) - .frame(maxWidth: .infinity, alignment: .leading) - if obj.side.count > 0 { - Text(obj.side) + HStack { + VStack { + Text(obj.name) + .frame(maxWidth: .infinity, alignment: .leading) + if obj.side.count > 0 { + Text(obj.side) + .font(.footnote) + .frame(maxWidth: .infinity, alignment: .leading) + } + Text(obj.equipmentRequired) + .font(.footnote) + .frame(maxWidth: .infinity, alignment: .leading) + Text(obj.muscleGroups) .font(.footnote) .frame(maxWidth: .infinity, alignment: .leading) } - Text(obj.equipmentRequired) - .font(.footnote) - .frame(maxWidth: .infinity, alignment: .leading) - Text(obj.muscleGroups) - .font(.footnote) - .frame(maxWidth: .infinity, alignment: .leading) - } - .contentShape(Rectangle()) - .onTapGesture { - selectedWorkout(obj) - dismiss() + .contentShape(Rectangle()) + .onTapGesture { + selectedWorkout(obj) + dismiss() + } + Button(action: { + }) { + Image(systemName: "video.fill") + } + .frame(width: 22, height: 22) + .background(.clear) + .foregroundColor(.blue) + .cornerRadius(10) } } }