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
2024-06-17 11:36:24 -07:00
parent abe17f89b2
commit 510e1ad200
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Werkout_ios/BaseURLs.swift
View File

@@ -12,6 +12,6 @@ enum BaseURLs: String {
case dev = "https://dev.werkout.fitness"
static var currentBaseURL: String {
return BaseURLs.dev.rawValue
return BaseURLs.local.rawValue
}
}

6
Werkout_ios/Views/WorkoutDetail/CurrentWorkoutElapsedTimeView.swift
View File

@@ -12,8 +12,10 @@ struct CurrentWorkoutElapsedTimeView: View {
var body: some View {
if bridgeModule.currentWorkoutRunTimeInSeconds > -1 {
Text("\(Double(bridgeModule.currentWorkoutRunTimeInSeconds).asString(style: .positional))")
.font(.title2)
VStack {
Text("\(Double(bridgeModule.currentWorkoutRunTimeInSeconds).asString(style: .positional))")
.font(.title2)
}
}
}
}

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

@@ -35,7 +35,6 @@ struct WorkoutDetailView: View {
VStack(spacing: 0) {
if bridgeModule.isInWorkout {
HStack {
CurrentWorkoutElapsedTimeView()
CountdownView()
}
.padding()
@@ -92,18 +91,22 @@ struct WorkoutDetailView: View {
if bridgeModule.isInWorkout {
Divider()
HStack {
Text("Round \(bridgeModule.currentExerciseInfo.currentRound) of \(bridgeModule.currentExerciseInfo.numberOfRoundsInCurrentSuperSet)")
Text("\(bridgeModule.currentExerciseInfo.currentRound) of \(bridgeModule.currentExerciseInfo.numberOfRoundsInCurrentSuperSet)")
.font(.title3)
.lineLimit(1)
.padding()
.bold()
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.leading, 10)
Text("Current: \(bridgeModule.currentExerciseInfo.allSupersetExecerciseIndex+1) of \(bridgeModule.currentExerciseInfo.workout?.allSupersetExecercise?.count ?? -99)")
CurrentWorkoutElapsedTimeView()
.frame(maxWidth: .infinity, alignment: .center)
Text("\(bridgeModule.currentExerciseInfo.allSupersetExecerciseIndex+1)/\(bridgeModule.currentExerciseInfo.workout?.allSupersetExecercise?.count ?? -99)")
.font(.title3)
.lineLimit(1)
.padding()
.bold()
.frame(maxWidth: .infinity, alignment: .trailing)
.padding(.trailing, 10)
}
.padding([.top, .bottom])
}
ExerciseListView(workout: workout, showExecersizeInfo: $showExecersizeInfo)

2
Werkout_ios/subview/CountdownView.swift
View File

@@ -17,7 +17,7 @@ struct CountdownView: View {
if bridgeModule.currentExerciseTimeLeft >= 0 && duration > bridgeModule.currentExerciseTimeLeft {
ProgressView(value: Float(bridgeModule.currentExerciseTimeLeft), total: Float(duration))
Text("\(bridgeModule.currentExerciseTimeLeft)")
.font(.body)
.font(.title3)
}
}
}