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-07-17 19:26:11 -05:00
parent 593cc496cd
commit af538362e8
23 changed files with 637 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,15 +18,15 @@ struct AddExerciseView: View {
@State var selectedMuscles = [Muscle]()
@State var selectedEquipment = [Equipment]()
@State var filteredExercises = [ExerciseExercise]()
@State var filteredExercises = [Exercise]()
@StateObject var bridgeModule = BridgeModule.shared
@Environment(\.dismiss) var dismiss
var selectedExercise: ((ExerciseExercise) -> Void)
var selectedExercise: ((Exercise) -> Void)
@State var createWorkoutItemPickerViewModel: CreateWorkoutItemPickerViewModel?
@State var createWorkoutItemPickerViewType: CreateWorkoutItemPickerViewType?
@State var searchString: String = ""
@State var videoExercise: ExerciseExercise? {
@State var videoExercise: Exercise? {
didSet {
if let viddd = self.videoExercise?.videoURL,
let url = URL(string: BaseURLs.currentBaseURL + viddd) {
@@ -111,19 +111,19 @@ struct AddExerciseView: View {
func filterExercises() {
if selectedMuscles.count == 0 {
filteredExercises = [ExerciseExercise]()
filteredExercises = [Exercise]()
return
}
if selectedEquipment.count == 0 {
filteredExercises = [ExerciseExercise]()
filteredExercises = [Exercise]()
return
}
guard let exercises = DataStore.shared.allExercise,
let muscles = DataStore.shared.allMuscles,
let equipment = DataStore.shared.allEquipment else {
filteredExercises = [ExerciseExercise]()
filteredExercises = [Exercise]()
return
}
@@ -132,7 +132,7 @@ struct AddExerciseView: View {
if selectedMuscles.count == muscles.count {
hasCorrectMuscles = true
} else {
let exerciseMuscleIds = exercise.muscles.map({ $0.muscle })
let exerciseMuscleIds = exercise.muscles.map({ $0.id })
let selctedMuscleIds = selectedMuscles.map({ $0.id })
// if one items match
if exerciseMuscleIds.contains(where: selctedMuscleIds.contains) {
@@ -146,7 +146,7 @@ struct AddExerciseView: View {
if selectedEquipment.count == equipment.count {
hasCorrectEquipment = true
} else {
let exerciseEquipmentIds = exercise.equipment.map({ $0.equipment })
let exerciseEquipmentIds = exercise.equipment.map({ $0.id })
let selctedEquipmentIds = selectedEquipment.map({ $0.id })
// if one items match
if exerciseEquipmentIds.contains(where: selctedEquipmentIds.contains) {
@@ -198,7 +198,7 @@ struct AddExerciseView: View {
var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]()
equipment.forEach({
let model = CreateWorkoutItemPickerModel(id: $0.id,
name: $0.name?.lowercased() ?? "-")
name: $0.name.lowercased())
createWorkoutItemPickerModels.append(model)
})
createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: {