WIP

Werkout_ios/Views/AllWorkouts/AllWorkoutPickerView.swift

@@ -0,0 +1,37 @@
+//
+//  AllWorkoutPickerView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 7/7/23.
+//
+
+import SwiftUI
+
+struct AllWorkoutPickerView: View {
+    var mainViews: [MainViewTypes]
+    @Binding var selectedSegment: MainViewTypes
+    @StateObject var bridgeModule = BridgeModule.shared
+    var showCurrentWorkout: (() -> Void)
+    
+    var body: some View {
+        HStack {
+            Picker("", selection: $selectedSegment) {
+                ForEach(mainViews, id: \.self) { viewType in
+                    Text(viewType.title)
+                }
+            }
+            .pickerStyle(.segmented)
+            .padding([.top, .leading, .trailing])
+            
+            if bridgeModule.isInWorkout {
+                Button(action: {
+                    showCurrentWorkout()
+                }, label: {
+                    Image(systemName: "figure.strengthtraining.traditional")
+                        .padding(.trailing)
+                })
+                .tint(.blue)
+            }
+        }
+    }
+}

Werkout_ios/Views/AllWorkouts/AllWorkoutsListView.swift

@@ -0,0 +1,88 @@
+//
+//  AllWorkoutsListView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 7/7/23.
+//
+
+import SwiftUI
+
+struct AllWorkoutsListView: View {
+    @State var searchString: String = ""
+    let workouts: [Workout]
+    
+    let selectedWorkout: ((Workout) -> Void)
+    
+    var filteredWorkouts: [Workout] {
+        if !searchString.isEmpty, searchString.count > 0 {
+            return workouts.filter({
+                if $0.name.lowercased().contains(searchString.lowercased()) {
+                    return true
+                }
+                if let equipment = $0.equipment?.joined(separator: "").lowercased(),
+                   equipment.contains(searchString.lowercased()) {
+                    return true
+                }
+                if let muscles = $0.muscles?.joined(separator: "").lowercased(),
+                   muscles.contains(searchString.lowercased()) {
+                    return true
+                }
+                
+                return false
+            })
+        } else {
+            return workouts
+        }
+    }
+    var refresh: (() -> Void)
+    
+    var body: some View {
+        VStack {
+            List {
+                ForEach(filteredWorkouts, id:\.name) { workout in
+                    Section {
+                        VStack {
+                            Text(workout.name)
+                                .font(.title2)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                            Text(workout.description ?? "")
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                            
+                            if let muscles = workout.muscles,
+                               muscles.joined(separator: ", ").count > 0{
+                                Divider()
+                                Text(muscles.joined(separator: ", "))
+                                    .font(.footnote)
+                                    .frame(maxWidth: .infinity, alignment: .leading)
+                            }
+                            
+                            if let equipment = workout.equipment,
+                               equipment.joined(separator: ", ").count > 0 {
+                                Divider()
+                                Text(equipment.joined(separator: ", "))
+                                    .font(.footnote)
+                                    .frame(maxWidth: .infinity, alignment: .leading)
+                            }
+                        }
+                        .contentShape(Rectangle())
+                        .onTapGesture {
+                            selectedWorkout(workout)
+                        }
+                    }
+                }
+            }
+            .refreshable {
+                refresh()
+            }
+            
+            TextField("Filter" ,text: $searchString)
+                .padding()
+                .textFieldStyle(OvalTextFieldStyle())
+            //            TextField("Filter", text: $searchString)
+            //                .padding()
+            //                .overlay(RoundedRectangle(cornerRadius: 10.0).strokeBorder(Color(uiColor: .darkGray), style: StrokeStyle(lineWidth: 1.0)))
+            //                .padding()
+            //                .background(Color(uiColor: .systemGroupedBackground))
+        }
+    }
+}

Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift

@@ -178,115 +178,6 @@ struct AllWorkoutsView: View {
     }
 }
 
-struct AllWorkoutPickerView: View {
-    var mainViews: [MainViewTypes]
-    @Binding var selectedSegment: MainViewTypes
-    @StateObject var bridgeModule = BridgeModule.shared
-    var showCurrentWorkout: (() -> Void)
-    
-    var body: some View {
-        HStack {
-            Picker("", selection: $selectedSegment) {
-                ForEach(mainViews, id: \.self) { viewType in
-                    Text(viewType.title)
-                }
-            }
-            .pickerStyle(.segmented)
-            .padding([.top, .leading, .trailing])
-            
-            if bridgeModule.isInWorkout {
-                Button(action: {
-                    showCurrentWorkout()
-                }, label: {
-                    Image(systemName: "figure.strengthtraining.traditional")
-                        .padding(.trailing)
-                })
-                .tint(.blue)
-            }
-        }
-    }
-}
-
-struct AllWorkoutsListView: View {
-    @State var searchString: String = ""
-    let workouts: [Workout]
-    
-    let selectedWorkout: ((Workout) -> Void)
-    
-    var filteredWorkouts: [Workout] {
-        if !searchString.isEmpty, searchString.count > 0 {
-            return workouts.filter({
-                if $0.name.lowercased().contains(searchString.lowercased()) {
-                    return true
-                }
-                if let equipment = $0.equipment?.joined(separator: "").lowercased(),
-                   equipment.contains(searchString.lowercased()) {
-                    return true
-                }
-                if let muscles = $0.muscles?.joined(separator: "").lowercased(),
-                   muscles.contains(searchString.lowercased()) {
-                    return true
-                }
-                
-                return false
-            })
-        } else {
-            return workouts
-        }
-    }
-    var refresh: (() -> Void)
-    
-    var body: some View {
-        VStack {
-            List {
-                ForEach(filteredWorkouts, id:\.name) { workout in
-                    Section {
-                        VStack {
-                            Text(workout.name)
-                                .font(.title2)
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                            Text(workout.description ?? "")
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                            
-                            if let muscles = workout.muscles,
-                               muscles.joined(separator: ", ").count > 0{
-                                Divider()
-                                Text(muscles.joined(separator: ", "))
-                                    .font(.footnote)
-                                    .frame(maxWidth: .infinity, alignment: .leading)
-                            }
-                            
-                            if let equipment = workout.equipment,
-                               equipment.joined(separator: ", ").count > 0 {
-                                Divider()
-                                Text(equipment.joined(separator: ", "))
-                                    .font(.footnote)
-                                    .frame(maxWidth: .infinity, alignment: .leading)
-                            }
-                        }
-                        .contentShape(Rectangle())
-                        .onTapGesture {
-                            selectedWorkout(workout)
-                        }
-                    }
-                }
-            }
-            .refreshable {
-                refresh()
-            }
-            
-            TextField("Filter" ,text: $searchString)
-                .padding()
-                .textFieldStyle(OvalTextFieldStyle())
-//            TextField("Filter", text: $searchString)
-//                .padding()
-//                .overlay(RoundedRectangle(cornerRadius: 10.0).strokeBorder(Color(uiColor: .darkGray), style: StrokeStyle(lineWidth: 1.0)))
-//                .padding()
-//                .background(Color(uiColor: .systemGroupedBackground))
-        }
-    }
-}
-
 struct AllWorkoutsView_Previews: PreviewProvider {
     static var previews: some View {
         AllWorkoutsView(workouts: PreviewData.allWorkouts())

Werkout_ios/Views/WorkoutDetail/ActionsView.swift

@@ -0,0 +1,101 @@
+//
+//  ActionsView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 7/7/23.
+//
+
+import SwiftUI
+
+struct ActionsView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    var completedWorkout: (() -> Void)?
+    var planWorkout: ((Workout) -> Void)?
+    
+    var workout: Workout
+    @Environment(\.dismiss) var dismiss
+    var showAddToCalendar: Bool
+    
+    var body: some View {
+        HStack {
+            if bridgeModule.isInWorkout == false {
+                Button(action: {
+                    bridgeModule.resetCurrentWorkout()
+                    dismiss()
+                }, label: {
+                    Image(systemName: "xmark.octagon.fill")
+                        .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.red)
+                .foregroundColor(.white)
+                
+                if showAddToCalendar {
+                    Button(action: {
+                        planWorkout?(workout)
+                    }, label: {
+                        Image(systemName: "calendar.badge.plus")
+                            .font(.title)
+                            .frame(maxWidth: .infinity, maxHeight: .infinity)
+                    })
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
+                    .background(.blue)
+                    .foregroundColor(.white)
+                }
+                
+                Button(action: {
+                    startWorkout()
+                }, label: {
+                    Image(systemName: "arrowtriangle.forward.fill")
+                        .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.green)
+                .foregroundColor(.white)
+            } else {
+                Button(action: {
+                    nextExercise()
+                }, label: {
+                    Image(systemName: "arrow.forward")
+                        .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.green)
+                .foregroundColor(.white)
+                
+                Button(action: {
+                    bridgeModule.pauseWorkout()
+                }, label: {
+                    Image(systemName: "pause.circle.fill")
+                        .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.yellow)
+                .foregroundColor(.white)
+                
+                Button(action: {
+                    completedWorkout?()
+                }, label: {
+                    Image(systemName: "checkmark")
+                        .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.blue)
+                .foregroundColor(.white)
+            }
+        }
+    }
+    
+    func nextExercise() {
+        bridgeModule.nextExercise()
+    }
+    
+    func startWorkout() {
+        bridgeModule.start(workout: workout)
+    }
+}

Werkout_ios/Views/WorkoutDetail/CountdownView.swift

@@ -0,0 +1,25 @@
+//
+//  CountdownView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 7/7/23.
+//
+
+import SwiftUI
+
+struct CountdownView: View {
+    @StateObject var bridgeModule = BridgeModule.shared
+    
+    var body: some View {
+        if let duration = bridgeModule.currentExercise?.duration,
+           duration > 0 {
+            HStack {
+                if bridgeModule.currentExerciseTimeLeft >= 0 && duration > bridgeModule.currentExerciseTimeLeft {
+                    ProgressView(value: Float(bridgeModule.currentExerciseTimeLeft), total: Float(duration))
+                    Text("\(bridgeModule.currentExerciseTimeLeft)")
+                        .font(.body)
+                }
+            }
+        }
+    }
+}

Werkout_ios/Views/WorkoutDetail/CurrentWorkoutElapsedTimeView.swift

@@ -0,0 +1,19 @@
+//
+//  CurrentWorkoutElapsedTimeView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 7/7/23.
+//
+
+import SwiftUI
+
+struct CurrentWorkoutElapsedTimeView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    
+    var body: some View {
+        if bridgeModule.currentWorkoutRunTimeInSeconds > -1 {
+            Text("\(Double(bridgeModule.currentWorkoutRunTimeInSeconds).asString(style: .positional))")
+                .font(.title2)
+        }
+    }
+}

Werkout_ios/Views/WorkoutDetail/ExerciseListView.swift

@@ -0,0 +1,104 @@
+//
+//  ExerciseListView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 7/7/23.
+//
+
+import SwiftUI
+import AVKit
+
+struct ExerciseListView: View {
+    @AppStorage("showNSFWVideos") private var showNSFWVideos = false
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    var workout: Workout
+    @State var avPlayer = AVPlayer(url: URL(string: "https://dev.werkout.fitness/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4")!)
+    @State var videoExercise: ExerciseExercise? {
+        didSet {
+            if showNSFWVideos {
+                if let viddd = self.videoExercise?.nsfwVideoURL,
+                   let url = URL(string: BaseURLs.currentBaseURL + viddd) {
+                    avPlayer = AVPlayer(url: url)
+                }
+            } else {
+                if let viddd = self.videoExercise?.videoURL,
+                   let url = URL(string: BaseURLs.currentBaseURL + viddd) {
+                    avPlayer = AVPlayer(url: url)
+                }
+            }
+        }
+    }
+    
+    var body: some View {
+        ScrollViewReader { proxy in
+            List() {
+                ForEach(workout.exercisesSortedByCreated_at.indices, id: \.self) { i in
+                    let obj = workout.exercisesSortedByCreated_at[i]
+                    HStack {
+                        if i == bridgeModule.currentExerciseIdx {
+                            Image(systemName: "checkmark")
+                                .foregroundColor(.green)
+                        }
+                        
+                        Text(obj.exercise.name)
+                            .id(i)
+                        
+                        Spacer()
+                        
+                        if let reps = obj.reps,
+                           reps > 0 {
+                            HStack {
+                                Image(systemName: "number")
+                                    .foregroundColor(.white)
+                                    .frame(width: 20, alignment: .leading)
+                                Text("\(reps)")
+                                    .foregroundColor(.white)
+                                    .frame(width: 30, alignment: .trailing)
+                                
+                            }
+                            .padding(5)
+                            .background(.blue)
+                            .cornerRadius(5, corners: [.topLeft, .bottomLeft])
+                            .frame(alignment: .trailing)
+                        }
+                        
+                        if let duration = obj.duration,
+                           duration > 0 {
+                            HStack {
+                                Image(systemName: "stopwatch")
+                                    .foregroundColor(.white)
+                                    .frame(width: 20, alignment: .leading)
+                                Text("\(duration)")
+                                    .foregroundColor(.white)
+                                    .frame(width: 30, alignment: .trailing)
+                            }
+                            .padding(5)
+                            .background(.green)
+                            .cornerRadius(5, corners: [.topLeft, .bottomLeft])
+                        }
+                    }
+                    .padding(.trailing, -20)
+                    .contentShape(Rectangle())
+                    .onTapGesture {
+                        if bridgeModule.isInWorkout {
+                            bridgeModule.goToExerciseAt(index: i)
+                        } else {
+                            videoExercise = obj.exercise
+                        }
+                    }
+                }
+            }
+            .onChange(of: bridgeModule.currentExerciseIdx, perform: { newValue in
+                withAnimation {
+                    proxy.scrollTo(newValue, anchor: .top)
+                }
+            })
+        }
+        .sheet(item: $videoExercise) { exercise in
+            PlayerView(player: $avPlayer)
+                .onAppear{
+                    avPlayer.play()
+                }
+        }
+    }
+}

Werkout_ios/Views/WorkoutDetail/InfoView.swift

@@ -0,0 +1,30 @@
+//
+//  InfoView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 7/7/23.
+//
+
+import SwiftUI
+
+struct InfoView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    var workout: Workout
+    
+    var body: some View {
+        VStack {
+            if bridgeModule.isInWorkout == false {
+                Text(workout.name)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .font(.title3)
+                    .padding()
+                if let desc = workout.description {
+                    Text(desc)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .font(.body)
+                        .padding([.leading, .trailing])
+                }
+            }
+        }
+    }
+}

Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift

@@ -150,244 +150,6 @@ struct WorkoutDetailView: View {
     }
 }
 
-struct InfoView: View {
-    @ObservedObject var bridgeModule = BridgeModule.shared
-    var workout: Workout
-    
-    var body: some View {
-        VStack {
-            if bridgeModule.isInWorkout == false {
-                Text(workout.name)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .font(.title3)
-                    .padding()
-                if let desc = workout.description {
-                    Text(desc)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                        .font(.body)
-                        .padding([.leading, .trailing])
-                }
-            }
-        }
-    }
-}
-
-struct ActionsView: View {
-    @ObservedObject var bridgeModule = BridgeModule.shared
-    var completedWorkout: (() -> Void)?
-    var planWorkout: ((Workout) -> Void)?
-    
-    var workout: Workout
-    @Environment(\.dismiss) var dismiss
-    var showAddToCalendar: Bool
-    
-    var body: some View {
-        HStack {
-            if bridgeModule.isInWorkout == false {
-                Button(action: {
-                    bridgeModule.resetCurrentWorkout()
-                    dismiss()
-                }, label: {
-                    Image(systemName: "xmark.octagon.fill")
-                        .font(.title)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                })
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .background(.red)
-                .foregroundColor(.white)
-                
-                if showAddToCalendar {
-                    Button(action: {
-                        planWorkout?(workout)
-                    }, label: {
-                        Image(systemName: "calendar.badge.plus")
-                            .font(.title)
-                            .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    })
-                    .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    .background(.blue)
-                    .foregroundColor(.white)
-                }
-                
-                Button(action: {
-                    startWorkout()
-                }, label: {
-                    Image(systemName: "arrowtriangle.forward.fill")
-                        .font(.title)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                })
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .background(.green)
-                .foregroundColor(.white)
-            } else {
-                Button(action: {
-                    nextExercise()
-                }, label: {
-                    Image(systemName: "arrow.forward")
-                        .font(.title)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                })
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .background(.green)
-                .foregroundColor(.white)
-                
-                Button(action: {
-                    bridgeModule.pauseWorkout()
-                }, label: {
-                    Image(systemName: "pause.circle.fill")
-                        .font(.title)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                })
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .background(.yellow)
-                .foregroundColor(.white)
-                
-                Button(action: {
-                    completedWorkout?()
-                }, label: {
-                    Image(systemName: "checkmark")
-                        .font(.title)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                })
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .background(.blue)
-                .foregroundColor(.white)
-            }
-        }
-    }
-    
-    func nextExercise() {
-        bridgeModule.nextExercise()
-    }
-    
-    func startWorkout() {
-        bridgeModule.start(workout: workout)
-    }
-}
-
-struct CurrentWorkoutElapsedTimeView: View {
-    @ObservedObject var bridgeModule = BridgeModule.shared
-    
-    var body: some View {
-        if bridgeModule.currentWorkoutRunTimeInSeconds > -1 {
-            Text("\(Double(bridgeModule.currentWorkoutRunTimeInSeconds).asString(style: .positional))")
-                .font(.title2)
-        }
-    }
-}
-
-struct ExerciseListView: View {
-    @AppStorage("showNSFWVideos") private var showNSFWVideos = false
-    @ObservedObject var bridgeModule = BridgeModule.shared
-    var workout: Workout
-    @State var avPlayer = AVPlayer(url: URL(string: "https://dev.werkout.fitness/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4")!)
-    @State var videoExercise: ExerciseExercise? {
-        didSet {
-            if showNSFWVideos {
-                if let viddd = self.videoExercise?.nsfwVideoURL,
-                   let url = URL(string: BaseURLs.currentBaseURL + viddd) {
-                    avPlayer = AVPlayer(url: url)
-                }
-            } else {
-                if let viddd = self.videoExercise?.videoURL,
-                   let url = URL(string: BaseURLs.currentBaseURL + viddd) {
-                    avPlayer = AVPlayer(url: url)
-                }
-            }
-        }
-    }
-    
-    var body: some View {
-        ScrollViewReader { proxy in
-            List() {
-                ForEach(workout.exercisesSortedByCreated_at.indices, id: \.self) { i in
-                    let obj = workout.exercisesSortedByCreated_at[i]
-                    HStack {
-                        if i == bridgeModule.currentExerciseIdx {
-                            Image(systemName: "checkmark")
-                                .foregroundColor(.green)
-                        }
-                        
-                        Text(obj.exercise.name)
-                            .id(i)
-
-                        Spacer()
-                        
-                        if let reps = obj.reps,
-                         reps > 0 {
-                            HStack {
-                                Image(systemName: "number")
-                                    .foregroundColor(.white)
-                                    .frame(width: 20, alignment: .leading)
-                                Text("\(reps)")
-                                    .foregroundColor(.white)
-                                    .frame(width: 30, alignment: .trailing)
-                                
-                            }
-                            .padding(5)
-                            .background(.blue)
-                            .cornerRadius(5, corners: [.topLeft, .bottomLeft])
-                            .frame(alignment: .trailing)
-                        }
-
-                        if let duration = obj.duration,
-                           duration > 0 {
-                            HStack {
-                                Image(systemName: "stopwatch")
-                                    .foregroundColor(.white)
-                                    .frame(width: 20, alignment: .leading)
-                                Text("\(duration)")
-                                    .foregroundColor(.white)
-                                    .frame(width: 30, alignment: .trailing)
-                            }
-                            .padding(5)
-                            .background(.green)
-                            .cornerRadius(5, corners: [.topLeft, .bottomLeft])
-                        }
-                    }
-                    .padding(.trailing, -20)
-                    .contentShape(Rectangle())
-                    .onTapGesture {
-                        if bridgeModule.isInWorkout {
-                            bridgeModule.goToExerciseAt(index: i)
-                        } else {
-                            videoExercise = obj.exercise
-                        }
-                    }
-                }
-            }
-            .onChange(of: bridgeModule.currentExerciseIdx, perform: { newValue in
-                withAnimation {
-                    proxy.scrollTo(newValue, anchor: .top)
-                }
-            })
-        }
-        .sheet(item: $videoExercise) { exercise in
-            PlayerView(player: $avPlayer)
-                .onAppear{
-                    avPlayer.play()
-                }
-        }
-    }
-}
-
-struct CountdownView: View {
-    @StateObject var bridgeModule = BridgeModule.shared
-    
-    var body: some View {
-        if let duration = bridgeModule.currentExercise?.duration,
-           duration > 0 {
-            HStack {
-                if bridgeModule.currentExerciseTimeLeft >= 0 && duration > bridgeModule.currentExerciseTimeLeft {
-                    ProgressView(value: Float(bridgeModule.currentExerciseTimeLeft), total: Float(duration))
-                    Text("\(bridgeModule.currentExerciseTimeLeft)")
-                        .font(.body)
-                }
-            }
-        }
-    }
-}
-
 struct WorkoutDetailView_Previews: PreviewProvider {
     static let workoutDetail = PreviewData.workout()
     static var previews: some View {