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>
120 lines
4.3 KiB
Swift
120 lines
4.3 KiB
Swift
//
|
|
// CompletedWorkoutsView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/16/24.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct CompletedWorkoutsView: View {
|
|
@State private var completedWorkouts: [CompletedWorkout]?
|
|
@State private var showCompletedWorkouts: Bool = false
|
|
@State private var loadError: String?
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading) {
|
|
if let completedWorkouts = completedWorkouts {
|
|
|
|
Divider()
|
|
.overlay(WerkoutTheme.divider)
|
|
|
|
Text("Workout History:")
|
|
.font(WerkoutTheme.sectionTitle)
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
|
|
HStack {
|
|
Text("Number of workouts:")
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
Text("\(completedWorkouts.count)")
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
}
|
|
|
|
if let lastWorkout = completedWorkouts.last {
|
|
HStack {
|
|
Text("Last workout:")
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
Text(lastWorkout.workoutStartTime)
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
}
|
|
|
|
Button("View All Workouts", action: {
|
|
showCompletedWorkouts = true
|
|
})
|
|
.font(.system(size: 16, weight: .bold))
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
.frame(height: 44)
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.accent)
|
|
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous))
|
|
.padding()
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
|
|
} else {
|
|
if let loadError = loadError {
|
|
Text(loadError)
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.danger)
|
|
} else {
|
|
Text("loading completed workouts")
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.textMuted)
|
|
}
|
|
}
|
|
}
|
|
.padding(WerkoutTheme.md)
|
|
.background(WerkoutTheme.surfaceCard)
|
|
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.cardRadius, style: .continuous))
|
|
.onAppear{
|
|
fetchCompletedWorkouts()
|
|
}
|
|
.refreshable {
|
|
await withCheckedContinuation { continuation in
|
|
CompletedWorkoutFetchable().fetch(completion: { result in
|
|
DispatchQueue.main.async {
|
|
switch result {
|
|
case .success(let model):
|
|
self.completedWorkouts = model
|
|
self.loadError = nil
|
|
case .failure(let failure):
|
|
self.loadError = "Unable to load workout history: \(failure.localizedDescription)"
|
|
}
|
|
continuation.resume()
|
|
}
|
|
})
|
|
}
|
|
}
|
|
.sheet(isPresented: $showCompletedWorkouts) {
|
|
if let completedWorkouts = completedWorkouts {
|
|
WorkoutHistoryView(completedWorkouts: completedWorkouts)
|
|
}
|
|
}
|
|
}
|
|
|
|
func fetchCompletedWorkouts() {
|
|
CompletedWorkoutFetchable().fetch(completion: { result in
|
|
switch result {
|
|
case .success(let model):
|
|
DispatchQueue.main.async {
|
|
completedWorkouts = model
|
|
loadError = nil
|
|
}
|
|
case .failure(let failure):
|
|
DispatchQueue.main.async {
|
|
loadError = "Unable to load workout history: \(failure.localizedDescription)"
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
CompletedWorkoutsView()
|
|
}
|