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>
167 lines
6.6 KiB
Swift
167 lines
6.6 KiB
Swift
//
|
|
// ExternalView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/13/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
import AVKit
|
|
|
|
struct ExternalWorkoutDetailView: View {
|
|
@ObservedObject var bridgeModule = BridgeModule.shared
|
|
@State var avPlayer = AVPlayer(url: URL(string: BaseURLs.currentBaseURL + "/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4") ?? URL(fileURLWithPath: "/dev/null"))
|
|
@State var smallAVPlayer = AVPlayer(url: URL(string: BaseURLs.currentBaseURL + "/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4") ?? URL(fileURLWithPath: "/dev/null"))
|
|
@State private var currentVideoURL: URL?
|
|
@State private var currentSmallVideoURL: URL?
|
|
@AppStorage(Constants.extThotStyle) private var extThotStyle: ThotStyle = .never
|
|
@AppStorage(Constants.extShowNextVideo) private var extShowNextVideo: Bool = false
|
|
@AppStorage(Constants.thotGenderOption) private var thotGenderOption: String = "female"
|
|
|
|
var body: some View {
|
|
ZStack {
|
|
if let workout = bridgeModule.currentWorkoutInfo.workout {
|
|
GeometryReader { metrics in
|
|
VStack {
|
|
HStack {
|
|
if extThotStyle != .off {
|
|
PlayerView(player: $avPlayer)
|
|
.frame(width: metrics.size.width * 0.5, height: metrics.size.height * 0.8)
|
|
.onAppear{
|
|
avPlayer.isMuted = true
|
|
avPlayer.play()
|
|
}
|
|
}
|
|
|
|
VStack {
|
|
ExtExerciseList(workout: workout,
|
|
allSupersetExecerciseIndex: bridgeModule.currentWorkoutInfo.allSupersetExecerciseIndex)
|
|
}
|
|
.frame(width: metrics.size.width * 0.4, height: metrics.size.height * 0.8)
|
|
.padding([.top, .bottom], WerkoutTheme.lg)
|
|
}
|
|
|
|
HStack {
|
|
ExtCountdownView()
|
|
.padding(.leading, 50)
|
|
.padding(.bottom, WerkoutTheme.lg)
|
|
|
|
if extShowNextVideo && extThotStyle != .off {
|
|
PlayerView(player: $smallAVPlayer)
|
|
.frame(width: metrics.size.width * 0.2,
|
|
height: metrics.size.height * 0.2)
|
|
.onAppear{
|
|
smallAVPlayer.isMuted = true
|
|
smallAVPlayer.play()
|
|
}
|
|
}
|
|
}
|
|
.background(WerkoutTheme.surfaceCard)
|
|
}
|
|
}
|
|
} else {
|
|
Image("icon")
|
|
.resizable()
|
|
.edgesIgnoringSafeArea(.all)
|
|
.scaledToFill()
|
|
}
|
|
|
|
VStack {
|
|
HStack {
|
|
if bridgeModule.currentWorkoutRunTimeInSeconds > -1 {
|
|
Text(" \(Double(bridgeModule.currentWorkoutRunTimeInSeconds).asString(style: .positional)) ")
|
|
.font(WerkoutTheme.stat)
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(1)
|
|
.padding()
|
|
.foregroundColor(WerkoutTheme.textPrimary)
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.accent)
|
|
}
|
|
Spacer()
|
|
}
|
|
.padding(.leading, 50)
|
|
Spacer()
|
|
}
|
|
|
|
}
|
|
.onChange(of: bridgeModule.isInWorkout) {
|
|
playVideos()
|
|
}
|
|
.onChange(of: bridgeModule.currentWorkoutInfo.allSupersetExecerciseIndex) {
|
|
playVideos()
|
|
}
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
.background(bridgeModule.currentWorkoutInfo.workout == nil ? WerkoutTheme.accent : WerkoutTheme.background)
|
|
.onReceive(NotificationCenter.default.publisher(
|
|
for: UIScene.willEnterForegroundNotification)) { _ in
|
|
avPlayer.play()
|
|
smallAVPlayer.play()
|
|
}
|
|
.onDisappear {
|
|
avPlayer.pause()
|
|
smallAVPlayer.pause()
|
|
}
|
|
}
|
|
|
|
func playVideos() {
|
|
if let currentExtercise = bridgeModule.currentWorkoutInfo.currentExercise {
|
|
if let videoURL = VideoURLCreator.videoURL(
|
|
thotStyle: extThotStyle,
|
|
gender: thotGenderOption,
|
|
defaultVideoURLStr: currentExtercise.exercise.videoURL,
|
|
exerciseName: currentExtercise.exercise.name,
|
|
workout: bridgeModule.currentWorkoutInfo.workout) {
|
|
updateMainPlayer(for: videoURL)
|
|
}
|
|
|
|
if let smallVideoURL = VideoURLCreator.videoURL(
|
|
thotStyle: .never,
|
|
gender: thotGenderOption,
|
|
defaultVideoURLStr: BridgeModule.shared.currentWorkoutInfo.nextExerciseInfo?.exercise.videoURL,
|
|
exerciseName: BridgeModule.shared.currentWorkoutInfo.nextExerciseInfo?.exercise.name,
|
|
workout: bridgeModule.currentWorkoutInfo.workout),
|
|
extShowNextVideo {
|
|
updateSmallPlayer(for: smallVideoURL)
|
|
}
|
|
}
|
|
}
|
|
|
|
private func updateMainPlayer(for url: URL) {
|
|
if currentVideoURL == url {
|
|
avPlayer.seek(to: .zero)
|
|
avPlayer.play()
|
|
return
|
|
}
|
|
|
|
currentVideoURL = url
|
|
avPlayer = AVPlayer(url: url)
|
|
avPlayer.play()
|
|
}
|
|
|
|
private func updateSmallPlayer(for url: URL) {
|
|
if currentSmallVideoURL == url {
|
|
smallAVPlayer.seek(to: .zero)
|
|
smallAVPlayer.play()
|
|
return
|
|
}
|
|
|
|
currentSmallVideoURL = url
|
|
smallAVPlayer = AVPlayer(url: url)
|
|
smallAVPlayer.play()
|
|
}
|
|
}
|
|
|
|
//struct ExternalWorkoutDetailView_Previews: PreviewProvider {
|
|
// static var bridge = BridgeModule.shared
|
|
//
|
|
// static var previews: some View {
|
|
// ExternalWorkoutDetailView().environmentObject({ () -> BridgeModule in
|
|
// let envObj = BridgeModule.shared
|
|
// envObj.currentWorkout = nil //PreviewData.workout()
|
|
// bridge.currentExercise = PreviewData.workout().exercisesSortedByCreated_at.first!
|
|
// return envObj
|
|
// }() )
|
|
// }
|
|
//}
|