5d39dcb66f
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
Deep audit (issues 2-14): - Add missing WCSession handlers for applicationContext and userInfo - Fix BoundedFIFOQueue race condition with serial dispatch queue - Fix timer race condition with main thread guarantee - Fix watch pause state divergence — phone is now source of truth - Fix wrong notification posted on logout (createdNewWorkout → userLoggedOut) - Fix POST status check to accept any 2xx (was exact match) - Fix @StateObject → @ObservedObject for injected viewModel - Add pull-to-refresh to CompletedWorkoutsView - Fix typos: RefreshUserInfoFetcable, defualtPackageModle - Replace string concatenation with interpolation - Replace 6 @StateObject with @ObservedObject for BridgeModule.shared - Replace 7 hardcoded AVPlayer URLs with BaseURLs.currentBaseURL UI audit (issues 1-15): - Fix GeometryReader eating VStack space — replaced with .overlay - Fix refreshable continuation resuming before fetch completes - Remove duplicate @State workouts — derive from DataStore - Decouple leaf views from BridgeModule (pass discrete values) - Convert selectedIds from Array to Set for O(1) lookups - Extract .sorted() from var body into computed properties - Move search filter out of ForEach render loop - Replace import SwiftUI with import Combine in non-UI classes - Mark all @State properties private - Extract L/R exercise auto-add logic to WorkoutViewModel - Use enumerated() instead of .indices in ForEach - Make AddSupersetView frame flexible instead of fixed 300pt - Hoist Set construction out of per-exercise filter loop - Move ViewModel network fetch from init to load() Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
77 lines
3.1 KiB
Swift
77 lines
3.1 KiB
Swift
//
|
|
// ExtCountdownView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/17/24.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct ExtCountdownView: View {
|
|
@ObservedObject var bridgeModule = BridgeModule.shared
|
|
|
|
var body: some View {
|
|
GeometryReader { metrics in
|
|
VStack {
|
|
if let currenExercise = bridgeModule.currentWorkoutInfo.currentExercise {
|
|
HStack {
|
|
Text(currenExercise.exercise.extName)
|
|
.font(.system(size: 200, weight: .black, design: .rounded))
|
|
.foregroundColor(WerkoutTheme.textPrimary)
|
|
.scaledToFit()
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(1)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
}
|
|
.frame(height: metrics.size.height * 0.5)
|
|
|
|
HStack {
|
|
if let duration = currenExercise.duration,
|
|
duration > 0 {
|
|
ProgressView(value: Float(bridgeModule.currentExerciseTimeLeft), total: Float(duration))
|
|
.scaleEffect(x: 1, y: 6, anchor: .center)
|
|
.tint(WerkoutTheme.accent)
|
|
Text("\(bridgeModule.currentExerciseTimeLeft)")
|
|
.font(WerkoutTheme.stat)
|
|
.foregroundColor(WerkoutTheme.accent)
|
|
.scaledToFit()
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(1)
|
|
.padding(.leading)
|
|
.padding(.trailing, 100)
|
|
}
|
|
|
|
if let reps = currenExercise.reps,
|
|
reps > 0 {
|
|
Text(" X \(reps)")
|
|
.font(.system(size: 100, weight: .heavy, design: .monospaced))
|
|
.foregroundColor(WerkoutTheme.textPrimary)
|
|
.scaledToFit()
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(1)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
}
|
|
|
|
if let weight = currenExercise.weight,
|
|
weight > 0 {
|
|
Text(" @ \(weight)")
|
|
.font(.system(size: 100, weight: .heavy, design: .monospaced))
|
|
.foregroundColor(WerkoutTheme.textSecondary)
|
|
.scaledToFit()
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(1)
|
|
.padding(.trailing, 100)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
}
|
|
}
|
|
.frame(height: metrics.size.height * 0.5)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
ExtCountdownView()
|
|
}
|