WIP
This commit is contained in:
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user