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-28 09:30:21 -05:00
parent 1a06a1dc95
commit 3391606ff3
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ struct AddExerciseView: View {
var body: some View { var body: some View {
VStack { VStack {
exerciseView() AllExerciseList()
.padding(.top) .padding(.top)
TextField("Filter", text: $searchString) TextField("Filter", text: $searchString)
@@ -125,7 +125,10 @@ struct AddExerciseView: View {
} else { } else {
let exerciseMuscleIds = exercise.muscles.map({ $0.muscle }) let exerciseMuscleIds = exercise.muscles.map({ $0.muscle })
let selctedMuscleIds = selectedMuscles.map({ $0.id }) let selctedMuscleIds = selectedMuscles.map({ $0.id })
if exerciseMuscleIds.contains(selctedMuscleIds) { // if one items match
if exerciseMuscleIds.contains(where: selctedMuscleIds.contains) {
// if all items match
// if exerciseMuscleIds.contains(selctedMuscleIds) {
hasCorrectMuscles = true hasCorrectMuscles = true
} }
} }
@@ -136,7 +139,10 @@ struct AddExerciseView: View {
} else { } else {
let exerciseEquipmentIds = exercise.equipment.map({ $0.equipment }) let exerciseEquipmentIds = exercise.equipment.map({ $0.equipment })
let selctedEquipmentIds = selectedEquipment.map({ $0.id }) let selctedEquipmentIds = selectedEquipment.map({ $0.id })
if exerciseEquipmentIds.contains(selctedEquipmentIds) { // if one items match
if exerciseEquipmentIds.contains(where: selctedEquipmentIds.contains) {
// if all items match
// if exerciseEquipmentIds.contains(selctedEquipmentIds) {
hasCorrectEquipment = true hasCorrectEquipment = true
} }
} }
@@ -196,7 +202,7 @@ struct AddExerciseView: View {
} }
} }
func exerciseView() -> some View { func AllExerciseList() -> some View {
List() { List() {
ForEach(filteredExercises.indices, id: \.self) { i in ForEach(filteredExercises.indices, id: \.self) { i in
let exercise = filteredExercises[i] let exercise = filteredExercises[i]
@@ -205,17 +211,24 @@ struct AddExerciseView: View {
VStack { VStack {
Text(exercise.name) Text(exercise.name)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
if exercise.side.count > 0 {
if !exercise.side.isEmpty {
Text(exercise.side) Text(exercise.side)
.font(.footnote) .font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
} }
Text(exercise.equipmentRequired)
.font(.footnote) if !exercise.equipmentRequired.isEmpty {
.frame(maxWidth: .infinity, alignment: .leading) Text(exercise.equipmentRequired)
Text(exercise.muscleGroups) .font(.footnote)
.font(.footnote) .frame(maxWidth: .infinity, alignment: .leading)
.frame(maxWidth: .infinity, alignment: .leading) }
if !exercise.muscleGroups.isEmpty {
Text(exercise.muscleGroups)
.font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading)
}
} }
.contentShape(Rectangle()) .contentShape(Rectangle())
.onTapGesture { .onTapGesture {
@@ -228,17 +241,13 @@ struct AddExerciseView: View {
ZStack { ZStack {
Circle() Circle()
.fill(.blue) .fill(.blue)
.frame(width: 44, height: 44) .frame(width: 33, height: 33)
Image(systemName: "video.fill") Image(systemName: "video.fill")
.frame(width: 44, height: 44) .frame(width: 33, height: 33)
.foregroundColor(.white) .foregroundColor(.white )
} }
} }
.frame(width: 44, height: 44) .frame(width: 33, height: 33)
.background(.clear)
.cornerRadius(10)
} }
} }
} }

3
Werkout_ios/Views/VideoPlayerView.swift
View File

@@ -22,9 +22,12 @@ struct VideoPlayerView: View {
Text("Done") Text("Done")
}) })
.padding() .padding()
.frame(maxWidth: .infinity)
.background(Color(uiColor: UIColor(red: 0.11, green: 0.11, blue: 0.12, alpha: 1)))
SafariWebView(url: url) SafariWebView(url: url)
} }
.background(.black)
} }
} }