From b53381e8ce279a6f0fd987336b3ed6e1116cdf00 Mon Sep 17 00:00:00 2001
From: rzen <rzenetl@gmail.com>
Date: Wed, 8 Jul 2026 14:45:53 -0400
Subject: [PATCH] Give the watch workout screen entirely to the up/down timer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The half-and-half split (paged timer over the looping form-guide figure)
is now iPhone-only. On the watch the ExerciseProgressView TabView fills the
whole screen — the figure slot is gone from both the active flow and the
Completed state, and the ExerciseFigure sources and ExerciseMotions
resources are dropped from the watch target since nothing there uses them.

Claude-Session: https://claude.ai/code/session_01HJDQQDA9QdP8zByg43H5v3
---
 CHANGELOG.md                                  |  2 +
 .../Views/ExerciseProgressView.swift          | 39 +++++++------------
 project.yml                                   |  5 ---
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 190e14d..0ae7156 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 **July 2026**
 
+On Apple Watch, the workout screen now gives its whole display to the set and rest timer, without the form-guide figure shown on iPhone.
+
 Barbells and pull-up bars in the animated form guide now turn with the figure as the view circles, instead of hovering fixed on screen.
 
 The goblet squat form guide now holds the weight at the chest with elbows tucked down, instead of flaring oddly.
diff --git a/Workouts Watch App/Views/ExerciseProgressView.swift b/Workouts Watch App/Views/ExerciseProgressView.swift
index ac0399e..2250756 100644
--- a/Workouts Watch App/Views/ExerciseProgressView.swift	
+++ b/Workouts Watch App/Views/ExerciseProgressView.swift	
@@ -189,38 +189,29 @@ struct ExerciseProgressView: View {
 
     var body: some View {
         if startsCompleted {
-            // Same top/bottom split as the run flow, so the form-guide figure
-            // stays on screen (matching the iPhone counterpart).
-            VStack(spacing: 0) {
-                CompletedPhaseView()
-                ExerciseFigureSlot(exerciseName: log?.exerciseName ?? "")
-            }
+            CompletedPhaseView()
         } else {
             flowBody
         }
     }
 
     private var flowBody: some View {
-        VStack(spacing: 0) {
-            // Paged flow — top half.
-            TabView(selection: $currentPage) {
-                ForEach(0..<totalPages, id: \.self) { index in
-                    page(for: index)
-                        .tag(index)
-                }
+        // The full-screen paged counter flow. Unlike the iPhone's half-and-half split,
+        // the watch shows no form-guide figure beneath it — the small screen is given
+        // over entirely to the up/down timer.
+        TabView(selection: $currentPage) {
+            ForEach(0..<totalPages, id: \.self) { index in
+                page(for: index)
+                    .tag(index)
             }
-            .tabViewStyle(.page(indexDisplayMode: .never))
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .overlay(alignment: .bottom) {
-                if let dots = workDots {
-                    WorkPhaseDots(model: dots)
-                        .padding(.bottom, 2)
-                }
+        }
+        .tabViewStyle(.page(indexDisplayMode: .never))
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .overlay(alignment: .bottom) {
+            if let dots = workDots {
+                WorkPhaseDots(model: dots)
+                    .padding(.bottom, 2)
             }
-
-            // Bottom half: the looping form-guide figure when a bundled motion
-            // matches this exercise; empty space otherwise.
-            ExerciseFigureSlot(exerciseName: log?.exerciseName ?? "")
         }
         .toolbar {
             ToolbarItem(placement: .cancellationAction) {
diff --git a/project.yml b/project.yml
index 7857797..921e5bf 100644
--- a/project.yml
+++ b/project.yml
@@ -111,11 +111,6 @@ targets:
         excludes:
           - "Resources/Info-*.plist"
           - "Resources/*.entitlements"
-      # The form-guide figure renderer and its bundled motion rigs are shared
-      # with the iOS app (which includes them via the whole `Workouts` folder).
-      - path: Workouts/ExerciseFigure
-      - path: Workouts/Resources/ExerciseMotions
-        buildPhase: resources
     dependencies:
       - package: IndieSync
       - target: Workouts Watch Widget