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-26 09:57:12 -05:00
parent e16a127579
commit 79ee615e8c
16 changed files with 180 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Werkout_ios/Views/AccountView/AccountView.swift
View File

@@ -11,6 +11,7 @@ import SwiftUI
struct AccountView: View {
@State var completedWorkouts: [CompletedWorkout]?
@ObservedObject var userStore = UserStore.shared
@State var showCompletedWorkouts: Bool = false
var body: some View {
VStack(alignment: .leading) {
@@ -44,8 +45,19 @@ struct AccountView: View {
Text("Last workout:")
Text(lastWorkout.workoutStartTime)
}
Button("View All Workouts", action: {
showCompletedWorkouts = true
})
.frame(maxWidth: .infinity, alignment: .center)
.frame(height: 44)
.foregroundColor(.blue)
.background(.yellow)
.cornerRadius(8)
.padding()
.frame(maxWidth: .infinity)
}
}
}
Spacer()
@@ -62,11 +74,17 @@ struct AccountView: View {
.frame(maxWidth: .infinity)
}
.padding()
.sheet(isPresented: $showCompletedWorkouts) {
if let history = completedWorkouts {
WorkoutHistoryView(completedWorkouts: history)
}
}
.onAppear{
if completedWorkouts == nil {
fetchCompletedWorkouts()
}
}
}
func fetchCompletedWorkouts() {
@@ -83,7 +101,7 @@ struct AccountView: View {
struct AccountView_Previews: PreviewProvider {
static let userStore = UserStore.shared
static let completedWorkouts = PreviewWorkout.parseCompletedWorkouts()
static let completedWorkouts = PreviewData.parseCompletedWorkouts()
static var previews: some View {
AccountView(completedWorkouts: completedWorkouts)

2
Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift
View File

@@ -90,6 +90,6 @@ struct AllWorkoutsView: View {
struct AllWorkoutsView_Previews: PreviewProvider {
static var previews: some View {
AllWorkoutsView(workouts: PreviewWorkout.allWorkouts())
AllWorkoutsView(workouts: PreviewData.allWorkouts())
}
}

2
Werkout_ios/Views/CompletedWorkout/CompletedWorkoutView.swift
View File

@@ -171,7 +171,7 @@ struct CompletedWorkoutView_Previews: PreviewProvider {
"heart_rates": [65,65,4,54,232,12]
] as [String : Any]
static let workout = PreviewWorkout.workout()
static let workout = PreviewData.workout()
static var previews: some View {
CompletedWorkoutView(postData: CompletedWorkoutView_Previews.postBody,

4
Werkout_ios/Views/ExternalWorkoutDetailView.swift
View File

@@ -147,8 +147,8 @@ struct ExternalWorkoutDetailView_Previews: PreviewProvider {
static var previews: some View {
ExternalWorkoutDetailView().environmentObject({ () -> BridgeModule in
let envObj = BridgeModule.shared
envObj.currentWorkout = PreviewWorkout.workout()
bridge.currentExercise = PreviewWorkout.workout().exercisesSortedByCreated_at.first!
envObj.currentWorkout = PreviewData.workout()
bridge.currentExercise = PreviewData.workout().exercisesSortedByCreated_at.first!
return envObj
}() )
}

2
Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift
View File

@@ -244,7 +244,7 @@ struct CountdownView: View {
}
struct WorkoutDetailView_Previews: PreviewProvider {
static let workoutDetail = PreviewWorkout.workout()
static let workoutDetail = PreviewData.workout()
static var previews: some View {
WorkoutDetailView(viewModel: WorkoutDetailViewModel(workout: WorkoutDetailView_Previews.workoutDetail, status: .showWorkout(WorkoutDetailView_Previews.workoutDetail)))
}

85
Werkout_ios/Views/WorkoutHistoryView.swift Normal file
View File

@@ -0,0 +1,85 @@
//
// WorkoutHistoryView.swift
// Werkout_ios
//
// Created by Trey Tartt on 6/26/23.
//
import SwiftUI
struct WorkoutHistoryView: View {
enum DifficltyString: Int {
case easy = 1
case moderate
case average
case hard
case death
var stringValue: String {
switch self {
case .easy:
return "Easy"
case .moderate:
return "Moderate"
case .average:
return "Average"
case .hard:
return "Hard"
case .death:
return "Death"
}
}
}
let completedWorkouts: [CompletedWorkout]
var body: some View {
List {
ForEach(completedWorkouts, id:\.self.id) { completedWorkout in
HStack {
VStack {
if let date = completedWorkout.workoutStartTime.dateFromServerDate {
Text(DateFormatter().shortMonthSymbols[date.get(.month) - 1])
Text("\(date.get(.day))")
Text("\(date.get(.hour))")
}
}
VStack(alignment: .leading) {
HStack {
}
Text(completedWorkout.workout.name)
.font(.title3)
if let desc = completedWorkout.workout.description {
Text(desc)
.font(.footnote)
}
Divider()
if let difficulty = completedWorkout.difficulty,
let string = DifficltyString.init(rawValue: difficulty)?.stringValue {
Text(string)
}
if let notes = completedWorkout.notes {
Text(notes)
}
}
.padding(.leading)
}
}
}
}
}
struct WorkoutHistoryView_Previews: PreviewProvider {
static let fakeHistory = PreviewData.parseCompletedWorkouts()
static var previews: some View {
WorkoutHistoryView(completedWorkouts: fakeHistory)
}
}