Restructure into a three-tab app with Progress, goals, and Meditation

The UX redesign's first landing (spec in UX-REDESIGN.md): ContentView
becomes a Today / Progress / Settings TabView, "Routine" replaces
"Split" in every user-facing string and view name (code-level types
keep their names), and workout starting moves to shared
WorkoutStarter / StartedWorkoutNavigator plumbing.

- New Progress tab: weekly goal streaks, workout trends, per-exercise
  weight progression, achievements, and the full history list
  (WorkoutLogsView -> WorkoutHistoryView).
- Goals: stable categories workouts roll up to, managed from Settings.
- New Meditation exercise + starter routine; timed sits record to
  Apple Health as Mind & Body sessions.

Claude-Session: https://claude.ai/code/session_012qw2itfzKyEJ1HpsFt8Ex4
This commit is contained in:
2026-07-11 07:53:01 -04:00
parent 5c201289fb
commit 6e440317c4
97 changed files with 5354 additions and 1291 deletions
+2
View File
@@ -40,6 +40,7 @@ it is a considered exclusion, not a gap.
| Core flexion | Abdominal | — | Crunch, Reverse Crunch, Leg Raises |
| Mobility / warm-up | — | — | Cat-Cow, March in Place, Leg Swings, Neck Rolls, Arm Circles, Torso Twist, Standing Side Bend, Hip Circles |
| Static stretch | — | — | Standing Forward Fold, Standing Quad Stretch, Standing Calf Stretch, Chest Opener, Overhead Triceps Stretch, Kneeling Hip Flexor Stretch, Butterfly Stretch, Cobra Stretch, Child's Pose |
| Mindfulness / breath | — | — | Meditation |
## Gym-floor census
@@ -60,6 +61,7 @@ entries) a user logging by that station's name will find.
| Floor / mat | Bodyweight Squat, Push-Up, Crunch, Glute Bridge, Plank, Side Plank, Bird Dog, Dead Bug, Hollow Body Hold, Leg Raises, Reverse Crunch, Cat-Cow |
| Open floor (warm-up / mobility) | March in Place, Leg Swings, Neck Rolls, Arm Circles, Torso Twist, Standing Side Bend, Hip Circles, Standing Calf Raise |
| Stretching mat (cool-down) | Standing Forward Fold, Standing Quad Stretch, Standing Calf Stretch, Chest Opener, Overhead Triceps Stretch, Kneeling Hip Flexor Stretch, Butterfly Stretch, Cobra Stretch, Child's Pose |
| Quiet corner (mindfulness) | Meditation |
## Considered exclusions (the "most gyms" line)
@@ -0,0 +1,42 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 180" fill="none">
<title>Meditation</title>
<defs>
<linearGradient id="grad-leg_l-2" gradientUnits="userSpaceOnUse" x1="181.2" y1="162.0" x2="187.1" y2="169.5"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#555a66"/></linearGradient>
<linearGradient id="grad-leg_r-0" gradientUnits="userSpaceOnUse" x1="155.1" y1="143.9" x2="155.0" y2="154.1"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-leg_r-1" gradientUnits="userSpaceOnUse" x1="155.0" y1="154.1" x2="171.4" y2="161.5"><stop offset="0" stop-color="#3a3f4b"/><stop offset="1" stop-color="#535964"/></linearGradient>
<linearGradient id="grad-leg_r-2" gradientUnits="userSpaceOnUse" x1="171.4" y1="161.5" x2="178.1" y2="169.0"><stop offset="0" stop-color="#535964"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-arm_l-1" gradientUnits="userSpaceOnUse" x1="190.7" y1="90.5" x2="176.0" y2="102.3"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-arm_r-0" gradientUnits="userSpaceOnUse" x1="161.6" y1="63.3" x2="151.2" y2="91.0"><stop offset="0" stop-color="#535864"/><stop offset="1" stop-color="#8d939e"/></linearGradient>
<linearGradient id="grad-arm_r-1" gradientUnits="userSpaceOnUse" x1="151.2" y1="91.0" x2="174.0" y2="101.8"><stop offset="0" stop-color="#8d939e"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
</defs>
<path d="M 121.1 156.4 L 186.2 167.7 L 228.7 160.4 L 163.5 149.0 Z" fill="none" stroke="#b9bec9" stroke-width="3" stroke-linejoin="round"/>
<g id="leg_l">
<path d="M 169.1 143.5 L 215.1 145.8" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 215.1 145.8 L 181.2 162.0" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 181.2 162.0 L 187.1 169.5" stroke="url(#grad-leg_l-2)" stroke-width="5.37996" stroke-linecap="round"/>
</g>
<path id="girdle" d="M 181.3 62.0 L 169.4 62.0 L 161.6 63.3" stroke="#0d9488" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<path id="pelvisBar" d="M 169.1 143.5 L 160.0 143.0 L 155.1 143.9" stroke="#0d9488" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<path id="spine" d="M 160.0 143.0 Q 163.8 101.1 169.4 62.0" stroke="#0d9488" stroke-width="6" stroke-linecap="round" stroke-linejoin="round"/>
<g id="leg_r">
<path d="M 155.1 143.9 L 155.0 154.1" stroke="url(#grad-leg_r-0)" stroke-width="5.5" stroke-linecap="round"/>
<path d="M 155.0 154.1 L 171.4 161.5" stroke="url(#grad-leg_r-1)" stroke-width="5.88568" stroke-linecap="round"/>
<path d="M 171.4 161.5 L 178.1 169.0" stroke="url(#grad-leg_r-2)" stroke-width="5.88568" stroke-linecap="round"/>
</g>
<g id="arm_l">
<path d="M 181.3 62.0 L 190.7 90.5" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 190.7 90.5 L 176.0 102.3" stroke="url(#grad-arm_l-1)" stroke-width="5.5" stroke-linecap="round"/>
</g>
<g id="arm_r">
<path d="M 161.6 63.3 L 151.2 91.0" stroke="url(#grad-arm_r-0)" stroke-width="5.51226" stroke-linecap="round"/>
<path d="M 151.2 91.0 L 174.0 101.8" stroke="url(#grad-arm_r-1)" stroke-width="5.6245" stroke-linecap="round"/>
</g>
<circle id="head" cx="172.8" cy="43.4" r="10" fill="white" stroke="#3a3f4b" stroke-width="6"/>
<line id="nose" x1="182.3" y1="46.5" x2="187.3" y2="48.1" stroke="#3a3f4b" stroke-width="4" stroke-linecap="round"/>
<g font-family="-apple-system, Helvetica, sans-serif" font-size="11" fill="#6b7180">
<line x1="224" y1="16" x2="238" y2="16" stroke="#3a3f4b" stroke-width="4" stroke-linecap="round"/>
<text x="243" y="20">near</text>
<line x1="273" y1="16" x2="287" y2="16" stroke="#a9afba" stroke-width="4" stroke-linecap="round"/>
<text x="292" y="20">far</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.9 KiB

@@ -0,0 +1,41 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 180" fill="none">
<title>Meditation</title>
<defs>
<linearGradient id="grad-leg_l-2" gradientUnits="userSpaceOnUse" x1="181.4" y1="160.6" x2="187.3" y2="168.1"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#515762"/></linearGradient>
<linearGradient id="grad-arm_l-1" gradientUnits="userSpaceOnUse" x1="189.0" y1="85.4" x2="176.0" y2="99.7"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-leg_r-0" gradientUnits="userSpaceOnUse" x1="155.1" y1="142.9" x2="155.0" y2="152.5"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-leg_r-1" gradientUnits="userSpaceOnUse" x1="155.0" y1="152.5" x2="171.6" y2="160.2"><stop offset="0" stop-color="#3a3f4b"/><stop offset="1" stop-color="#525763"/></linearGradient>
<linearGradient id="grad-leg_r-2" gradientUnits="userSpaceOnUse" x1="171.6" y1="160.2" x2="178.4" y2="167.5"><stop offset="0" stop-color="#525763"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-arm_r-0" gradientUnits="userSpaceOnUse" x1="155.4" y1="60.3" x2="147.0" y2="88.3"><stop offset="0" stop-color="#7b808c"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
</defs>
<path d="M 121.1 156.4 L 186.2 167.7 L 228.7 160.3 L 163.5 149.0 Z" fill="none" stroke="#b9bec9" stroke-width="3" stroke-linejoin="round"/>
<g id="leg_l">
<path d="M 169.1 142.5 L 215.1 144.2" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 215.1 144.2 L 181.4 160.6" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 181.4 160.6 L 187.3 168.1" stroke="url(#grad-leg_l-2)" stroke-width="5.39483" stroke-linecap="round"/>
</g>
<path id="girdle" d="M 175.1 59.0 L 163.2 59.0 L 155.4 60.3" stroke="#0d9488" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<path id="pelvisBar" d="M 169.1 142.5 L 160.0 142.0 L 155.1 142.9" stroke="#0d9488" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<path id="spine" d="M 160.0 142.0 Q 162.7 99.8 163.2 59.0" stroke="#0d9488" stroke-width="6" stroke-linecap="round" stroke-linejoin="round"/>
<g id="arm_l">
<path d="M 175.1 59.0 L 189.0 85.4" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 189.0 85.4 L 176.0 99.7" stroke="url(#grad-arm_l-1)" stroke-width="5.5" stroke-linecap="round"/>
</g>
<g id="leg_r">
<path d="M 155.1 142.9 L 155.0 152.5" stroke="url(#grad-leg_r-0)" stroke-width="5.5" stroke-linecap="round"/>
<path d="M 155.0 152.5 L 171.6 160.2" stroke="url(#grad-leg_r-1)" stroke-width="5.89157" stroke-linecap="round"/>
<path d="M 171.6 160.2 L 178.4 167.5" stroke="url(#grad-leg_r-2)" stroke-width="5.89157" stroke-linecap="round"/>
</g>
<g id="arm_r">
<path d="M 155.4 60.3 L 147.0 88.3" stroke="url(#grad-arm_r-0)" stroke-width="5.70924" stroke-linecap="round"/>
<path d="M 147.0 88.3 L 174.0 99.2" stroke="#3a3f4b" stroke-width="6" stroke-linecap="round"/>
</g>
<circle id="head" cx="164.1" cy="39.5" r="10" fill="white" stroke="#3a3f4b" stroke-width="6"/>
<line id="nose" x1="174.1" y1="40.7" x2="179.0" y2="41.3" stroke="#3a3f4b" stroke-width="4" stroke-linecap="round"/>
<g font-family="-apple-system, Helvetica, sans-serif" font-size="11" fill="#6b7180">
<line x1="224" y1="16" x2="238" y2="16" stroke="#3a3f4b" stroke-width="4" stroke-linecap="round"/>
<text x="243" y="20">near</text>
<line x1="273" y1="16" x2="287" y2="16" stroke="#a9afba" stroke-width="4" stroke-linecap="round"/>
<text x="292" y="20">far</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.7 KiB

+41
View File
@@ -0,0 +1,41 @@
# Meditation
Sit tall with the legs crossed, rest the hands on the knees, and follow the
breath. A timed stillness practice that lowers stress, settles the nervous
system, and closes a session — or a day — with focus.
- **Category:** Mindfulness
- **Type:** Seated meditation (timed hold)
- **Targets:** Breath, focus, posture
- **Prescription:** Sit 510 min, attention on the breath, returning to it whenever the mind wanders
- **Defaults:** 1 × 300 s
## Setup
Sit on the floor (or a cushion) with the legs crossed — lotus, half-lotus, or a
simple cross, whatever the hips allow. Stack the spine tall, rest the hands on
the knees, and soften the gaze or close the eyes.
## Execution
1. Lengthen up through the crown of the head, letting the shoulders drop.
2. Breathe slowly through the nose — a long inhale, a longer exhale.
3. Rest the attention on the breath moving in and out.
4. When the mind wanders, notice it without judgment and return to the breath.
## Cues
- Sit on the front edge of a cushion to tilt the pelvis and free the spine.
- Let the breath deepen on its own — observe it rather than forcing it.
- Keep the face, jaw, and hands soft; effort lives only in the tall spine.
## Common Mistakes
- Slumping through the lower back as the sit goes on.
- Chasing every thought instead of letting it pass.
- Straining into a full lotus the hips aren't ready for — a simple cross works.
## Progression
A few minutes seated comfortably → longer sits with a steady tall spine →
half-lotus or full lotus as hip mobility allows.
+30
View File
@@ -0,0 +1,30 @@
{
"name": "Meditation",
"primary": 1,
"camera": {"yaw": 45},
"working": ["spine"],
"frames": [
{
"hold": 1.2, "tween": 2.6,
"root": {"pos": [160, 143], "pitch": 2},
"spine": [6, 2],
"neck": 4, "head": -8,
"shoulder_r": {"flexion": 30, "abduction": 8, "rotation": -25}, "elbow_r": 100,
"shoulder_l": {"flexion": 30, "abduction": 8, "rotation": -25}, "elbow_l": 100,
"hip_r": {"flexion": 88, "abduction": 45, "rotation": 50}, "knee_r": 146, "ankle_r": 0,
"hip_l": {"flexion": 88, "abduction": 45, "rotation": 50}, "knee_l": 146, "ankle_l": 0,
"pins": {"hand_r": [174, 95], "hand_l": [176, 96]}
},
{
"hold": 0.8, "tween": 2.8,
"root": {"pos": [160, 142], "pitch": 1},
"spine": [3, -2],
"neck": 2, "head": -6,
"shoulder_r": {"flexion": 33, "abduction": 8, "rotation": -25}, "elbow_r": 96,
"shoulder_l": {"flexion": 33, "abduction": 8, "rotation": -25}, "elbow_l": 96,
"hip_r": {"flexion": 88, "abduction": 45, "rotation": 50}, "knee_r": 146, "ankle_r": 0,
"hip_l": {"flexion": 88, "abduction": 45, "rotation": 50}, "knee_l": 146, "ankle_l": 0,
"pins": {"hand_r": [174, 93], "hand_l": [176, 94]}
}
]
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 483 KiB

+42
View File
@@ -0,0 +1,42 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 180" fill="none">
<title>Meditation</title>
<defs>
<linearGradient id="grad-leg_l-2" gradientUnits="userSpaceOnUse" x1="181.2" y1="162.0" x2="187.1" y2="169.5"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#555a66"/></linearGradient>
<linearGradient id="grad-leg_r-0" gradientUnits="userSpaceOnUse" x1="155.1" y1="143.9" x2="155.0" y2="154.1"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-leg_r-1" gradientUnits="userSpaceOnUse" x1="155.0" y1="154.1" x2="171.4" y2="161.5"><stop offset="0" stop-color="#3a3f4b"/><stop offset="1" stop-color="#535964"/></linearGradient>
<linearGradient id="grad-leg_r-2" gradientUnits="userSpaceOnUse" x1="171.4" y1="161.5" x2="178.1" y2="169.0"><stop offset="0" stop-color="#535964"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-arm_l-1" gradientUnits="userSpaceOnUse" x1="190.7" y1="90.5" x2="176.0" y2="102.3"><stop offset="0" stop-color="#a9afba"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
<linearGradient id="grad-arm_r-0" gradientUnits="userSpaceOnUse" x1="161.6" y1="63.3" x2="151.2" y2="91.0"><stop offset="0" stop-color="#535864"/><stop offset="1" stop-color="#8d939e"/></linearGradient>
<linearGradient id="grad-arm_r-1" gradientUnits="userSpaceOnUse" x1="151.2" y1="91.0" x2="174.0" y2="101.8"><stop offset="0" stop-color="#8d939e"/><stop offset="1" stop-color="#3a3f4b"/></linearGradient>
</defs>
<path d="M 121.1 156.4 L 186.2 167.7 L 228.7 160.4 L 163.5 149.0 Z" fill="none" stroke="#b9bec9" stroke-width="3" stroke-linejoin="round"/>
<g id="leg_l">
<path d="M 169.1 143.5 L 215.1 145.8" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 215.1 145.8 L 181.2 162.0" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 181.2 162.0 L 187.1 169.5" stroke="url(#grad-leg_l-2)" stroke-width="5.37996" stroke-linecap="round"/>
</g>
<path id="girdle" d="M 181.3 62.0 L 169.4 62.0 L 161.6 63.3" stroke="#0d9488" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<path id="pelvisBar" d="M 169.1 143.5 L 160.0 143.0 L 155.1 143.9" stroke="#0d9488" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
<path id="spine" d="M 160.0 143.0 Q 163.8 101.1 169.4 62.0" stroke="#0d9488" stroke-width="6" stroke-linecap="round" stroke-linejoin="round"/>
<g id="leg_r">
<path d="M 155.1 143.9 L 155.0 154.1" stroke="url(#grad-leg_r-0)" stroke-width="5.5" stroke-linecap="round"/>
<path d="M 155.0 154.1 L 171.4 161.5" stroke="url(#grad-leg_r-1)" stroke-width="5.88568" stroke-linecap="round"/>
<path d="M 171.4 161.5 L 178.1 169.0" stroke="url(#grad-leg_r-2)" stroke-width="5.88568" stroke-linecap="round"/>
</g>
<g id="arm_l">
<path d="M 181.3 62.0 L 190.7 90.5" stroke="#a9afba" stroke-width="5" stroke-linecap="round"/>
<path d="M 190.7 90.5 L 176.0 102.3" stroke="url(#grad-arm_l-1)" stroke-width="5.5" stroke-linecap="round"/>
</g>
<g id="arm_r">
<path d="M 161.6 63.3 L 151.2 91.0" stroke="url(#grad-arm_r-0)" stroke-width="5.51226" stroke-linecap="round"/>
<path d="M 151.2 91.0 L 174.0 101.8" stroke="url(#grad-arm_r-1)" stroke-width="5.6245" stroke-linecap="round"/>
</g>
<circle id="head" cx="172.8" cy="43.4" r="10" fill="white" stroke="#3a3f4b" stroke-width="6"/>
<line id="nose" x1="182.3" y1="46.5" x2="187.3" y2="48.1" stroke="#3a3f4b" stroke-width="4" stroke-linecap="round"/>
<g font-family="-apple-system, Helvetica, sans-serif" font-size="11" fill="#6b7180">
<line x1="224" y1="16" x2="238" y2="16" stroke="#3a3f4b" stroke-width="4" stroke-linecap="round"/>
<text x="243" y="20">near</text>
<line x1="273" y1="16" x2="287" y2="16" stroke="#a9afba" stroke-width="4" stroke-linecap="round"/>
<text x="292" y="20">far</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.9 KiB