wip

iphone/Werkout_ios/Views/AllWorkouts/AllWorkoutsListView.swift

@@ -9,11 +9,13 @@ import SwiftUI
 
 enum SortType: String, CaseIterable {
     case name = "Name"
-    case date = "Date"
+    case createdDate = "Created Date"
 }
 
 struct AllWorkoutsListView: View {
-    @State var searchString: String = ""
+    @State var searchNameString: String = ""
+    @State var selectedMuscles: Set<String> = []
+    @State var selectedEquipment: Set<String> = []
     @Binding var uniqueWorkoutUsers: [RegisteredUser]?
     @State private var filteredRegisterdUser: RegisteredUser?
     
@@ -30,7 +32,9 @@ struct AllWorkoutsListView: View {
                     Text((filteredRegisterdUser.firstName ?? "NA") + "'s Workouts")
                 }
                 
-                FilterAllView(searchString: $searchString,
+                FilterAllView(selectedMuscles: $selectedMuscles,
+                              selectedEquipment: $selectedEquipment,
+                              searchNameString: $searchNameString,
                               uniqueWorkoutUsers: $uniqueWorkoutUsers,
                               filteredRegisterdUser: $filteredRegisterdUser,
                               filteredWorkouts: $filteredWorkouts,
@@ -55,13 +59,28 @@ struct AllWorkoutsListView: View {
                 refresh()
             }
         }
-        .onChange(of: searchString) { newValue in
-            filteredWorkouts = workouts.filterWorkouts(searchString: searchString, filteredRegisterdUser: filteredRegisterdUser)
+        .onChange(of: searchNameString) { newValue in
+            filterWorkouts()
+        }
+        .onChange(of: selectedMuscles) { newValue in
+            filterWorkouts()
+        }
+        .onChange(of: selectedEquipment) { newValue in
+            filterWorkouts()
         }
         .onAppear{
-            filteredWorkouts = workouts.filterWorkouts(searchString: searchString, filteredRegisterdUser: filteredRegisterdUser)
+            filterWorkouts()
         }
     }
+    
+    func filterWorkouts() {
+        filteredWorkouts = workouts.filterWorkouts(
+            nameSearchString: searchNameString,
+            musclesSearchString: selectedMuscles,
+            equipmentSearchString: selectedEquipment,
+            filteredRegisterdUser: filteredRegisterdUser
+        )
+    }
 }
 
 struct AllWorkoutsListView_Previews: PreviewProvider {

iphone/Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift

@@ -155,7 +155,7 @@ struct AllWorkoutsView: View {
         
         healthStore.requestAuthorization(toShare: nil, read: healthKitTypes) { (succ, error) in
             if !succ {
-                fatalError("Error requesting authorization from health store: \(String(describing: error)))")
+//                fatalError("Error requesting authorization from health store: \(String(describing: error)))")
             }
         }
     }