rzen/workouts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Rouslan Zenetl
2025-07-22 20:55:04 -04:00
parent d2b8625f2e
commit 310c120ca3
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Worksouts Watch App/Views/ExerciseProgressControlView.swift
View File

@ -77,12 +77,21 @@ struct ExerciseProgressControlView: View {
.tag(index)
} else {
ExerciseStateView(
state: state,
title: state.isRest ? "Resting..." : state.isDone ? "Done" : "Set \(currentStateIndex)",
isRest: state.isRest,
isDone: state.isDone,
elapsedSeconds: elapsedSeconds,
onComplete: {
moveToNextState()
}
)
//
})
// ExerciseStateView(
//// state: state,
//
// elapsedSeconds: elapsedSeconds,
// onComplete: {
// moveToNextState()
// }
// )
.tag(index)
}
}
@ -185,39 +194,30 @@ struct ExerciseProgressControlView: View {
}
struct ExerciseStateView: View {
let state: ExerciseState
// let state: ExerciseState
let title: String
let isRest: Bool
let isDone: Bool
let elapsedSeconds: Int
let onComplete: () -> Void
var body: some View {
VStack(spacing: 20) {
// Title based on state
Text(stateTitle)
.font(.title3)
.fontWeight(.bold)
Text(title)
.font(.title)
// Timer display
Text(timeFormatted)
.font(.system(size: 48, weight: .semibold, design: .monospaced))
.foregroundStyle(state.isRest ? .orange : .accentColor)
.foregroundStyle(isRest ? .orange : .accentColor)
// Only show Done button and countdown for the final state
if state.isDone {
// Countdown message
if elapsedSeconds < 10 {
Text("Completing automatically in \(10 - elapsedSeconds) seconds")
.font(.caption)
.multilineTextAlignment(.center)
.foregroundStyle(.secondary)
} else {
Text("Auto-completing...")
.font(.caption)
.foregroundStyle(.secondary)
}
if isDone {
// Done button
Button(action: onComplete) {
Text("Done")
Text("Done in \(10 - elapsedSeconds)s")
.font(.headline)
.frame(maxWidth: .infinity)
}
@ -229,18 +229,18 @@ struct ExerciseStateView: View {
.padding()
}
private var stateTitle: String {
switch state {
case .set(let number):
return "Set \(number) in progress"
case .rest:
return "Resting"
case .done:
return "Exercise Complete"
case .detail:
return "Swipe to Start"
}
}
// private var stateTitle: String {
// switch state {
// case .set(let number):
// return "Set \(number)"
// case .rest:
// return "Resting..."
// case .done:
// return "Exercise Complete"
// case .detail:
// return "Swipe to Start"
// }
// }
// private var buttonTitle: String {
// switch state {