admin/WerkoutIOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Trey t
2023-06-25 22:10:21 -05:00
parent 57cc5e3ce5
commit b64ab4de13
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Werkout_ios/Views/AddExercise/AddExerciseView.swift
View File

@@ -151,7 +151,7 @@ struct AddExerciseView: View {
if let muscles = DataStore.shared.allMuscles { if let muscles = DataStore.shared.allMuscles {
var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]() var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]()
muscles.forEach({ 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.append(model)
}) })
createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: { createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: {
@@ -177,7 +177,7 @@ struct AddExerciseView: View {
var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]() var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]()
equipment.forEach({ equipment.forEach({
let model = CreateWorkoutItemPickerModel(id: $0.id, let model = CreateWorkoutItemPickerModel(id: $0.id,
name: $0.name ?? "-") name: $0.name?.lowercased() ?? "-")
createWorkoutItemPickerModels.append(model) createWorkoutItemPickerModels.append(model)
}) })
createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: { createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: {
@@ -195,25 +195,35 @@ struct AddExerciseView: View {
ForEach(filteredExercises.indices, id: \.self) { i in ForEach(filteredExercises.indices, id: \.self) { i in
let obj = filteredExercises[i] let obj = filteredExercises[i]
if searchString.isEmpty || obj.name.lowercased().contains(searchString.lowercased()) { if searchString.isEmpty || obj.name.lowercased().contains(searchString.lowercased()) {
VStack { HStack {
Text(obj.name) VStack {
.frame(maxWidth: .infinity, alignment: .leading) Text(obj.name)
if obj.side.count > 0 { .frame(maxWidth: .infinity, alignment: .leading)
Text(obj.side) 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) .font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
} }
Text(obj.equipmentRequired) .contentShape(Rectangle())
.font(.footnote) .onTapGesture {
.frame(maxWidth: .infinity, alignment: .leading) selectedWorkout(obj)
Text(obj.muscleGroups) dismiss()
.font(.footnote) }
.frame(maxWidth: .infinity, alignment: .leading) Button(action: {
} }) {
.contentShape(Rectangle()) Image(systemName: "video.fill")
.onTapGesture { }
selectedWorkout(obj) .frame(width: 22, height: 22)
dismiss() .background(.clear)
.foregroundColor(.blue)
.cornerRadius(10)
} }
} }
} }