From 510e1ad200ef8b438aa509181e658fe77b446059 Mon Sep 17 00:00:00 2001
From: Trey t <treytartt@fastmail.com>
Date: Mon, 17 Jun 2024 11:36:24 -0700
Subject: [PATCH] WIP

---
 Werkout_ios/BaseURLs.swift                      |  2 +-
 .../CurrentWorkoutElapsedTimeView.swift         |  6 ++++--
 .../Views/WorkoutDetail/WorkoutDetailView.swift | 17 ++++++++++-------
 Werkout_ios/subview/CountdownView.swift         |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Werkout_ios/BaseURLs.swift b/Werkout_ios/BaseURLs.swift
index c43c8e6..537f209 100644
--- a/Werkout_ios/BaseURLs.swift
+++ b/Werkout_ios/BaseURLs.swift
@@ -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
     }
 }
diff --git a/Werkout_ios/Views/WorkoutDetail/CurrentWorkoutElapsedTimeView.swift b/Werkout_ios/Views/WorkoutDetail/CurrentWorkoutElapsedTimeView.swift
index c6cc2cf..ecd1a74 100644
--- a/Werkout_ios/Views/WorkoutDetail/CurrentWorkoutElapsedTimeView.swift
+++ b/Werkout_ios/Views/WorkoutDetail/CurrentWorkoutElapsedTimeView.swift
@@ -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)
+            }
         }
     }
 }
diff --git a/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift b/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift
index 1044fa8..0efb660 100644
--- a/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift
+++ b/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift
@@ -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)
diff --git a/Werkout_ios/subview/CountdownView.swift b/Werkout_ios/subview/CountdownView.swift
index 356df39..d3b1b85 100644
--- a/Werkout_ios/subview/CountdownView.swift
+++ b/Werkout_ios/subview/CountdownView.swift
@@ -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)
                 }
             }
         }