Skip to content

feat(cardio): rebuild the Cardio screen on the shared design kit - #30

Merged
DX23876 merged 7 commits into
mainfrom
redesign/e-cardio
Sep 17, 2026
Merged

feat(cardio): rebuild the Cardio screen on the shared design kit#30
DX23876 merged 7 commits into
mainfrom
redesign/e-cardio

Conversation

@DX23876

@DX23876 DX23876 commented Sep 17, 2026

Copy link
Copy Markdown
Owner

Summary

Fifth package of the redesign. Stacked on #26 → #27 → #28 → #29; until those merge, this diff includes them.

The Cardio screen now reads:

  1. Week control: the shared stepper and history window.
  2. Cardio load hero: the same lane reading Training Load shows (refactor(training): one lane load reading for Training Load, Cardio and Strength #27). It carries the percentage vs usual, pill, trend, TRIMP ("at least" when a day is unpriced), complete/possible sessions, and the no-trace or lower-bound caveat.
  3. Week figures: sessions, moving time (usual range), distance (coverage), calories. Two per row on a phone so four-digit distances and double-digit hours keep their size; the usual-week bar sits below.
  4. Cardio load over time: 7D / 4W / 12W, with the usual-week band once a personal range exists.
  5. Intensity with the five personal zones, unchanged.
  6. Two new tiles:
    • Most used activity: the sport with the largest share of the week's measured load, plus that sport's weekly pace in its own unit (/km, /100 m for swimming, km/h for cycling). Tapping it selects that sport in Progress and scrolls there.
    • Average heart rate: time-weighted, against the median of earlier weeks. Tapping it scrolls to Intensity.
  7. Sport mix, progress, bests, recent sessions: unchanged.
  8. How it works: cardio load, bests, and zone provenance. These were the info sheet and the inline footnote.

Removed from the week grid: the "Load trend" and "Cardio load" tiles. Their content is in the hero.

New in StrandAnalytics: CardioSession.loadShareBySport, weeklyPaceSecPerKm, weeklyAverageHr, typicalWeeklyAverageHr.

Design kit tweaks (#28), from review of these screenshots:

  • The KPI strip goes 2×2 unless four columns fit.
  • The chart's "usual range appears after…" hint moves to its own line.
  • Tile titles may wrap to two lines.
  • A lane with no comparison shows no placeholder dash; the pill already says so.

Verification

  • swift test --filter CardioSessionTests (StrandAnalytics): 17 pass, including new tests for load share, pace per modality (swim /100 m), and duration-weighted heart rate against usual.
  • TrainingDesignKitTests + TrainingLoadLanesTests: 10 pass. macOS and iOS simulator builds succeed.
  • iPhone 17 Pro simulator, German, demo data: dark and light screenshots from top to bottom. Extreme values (1.245,6 km, 12h 36m, 12.069 kcal) were also rendered at 375 pt and 402 pt widths.
  • Strings: 7 new keys, translated into all nine languages and mirrored in Tools/translations. i18n_audit --ci origin/main exits 0.
  • doc_comment_lint: OK.

Analysis migration required: no

@DX23876
feat(design): add strength and cardio lane colour tokens
56e7d92 
Strength and Cardio both used effortColor, so the two training lanes were
indistinguishable. Each lane now owns one identity colour for all seven
chart styles in light and dark: electric teal for Strength and violet for
Cardio, kept clear of the status and Charge colours so a lane never reads
as a warning. The hexes live in LaneColorTable and LaneColorTests pin hue
separation and white-text contrast on the deep tones.

Analysis migration required: no
@DX23876
test(training): pin Training Load's lane readings with an oracle
7ed9af3 
Move the detached computation in TrainingLoadModel.load into a static
prepare function without changing a line of its arithmetic, so a fixture
can run it. The pinned figures cover rated and unrated sets, an unknown
cardio day inside and outside the window, a duplicate awaiting review and
a session rated twice.

Analysis migration required: no
@DX23876
refactor(training): read Cardio and Strength load from Training Load'…
edc8c7f 
…s lanes

The Cardio and Strength screens computed "load vs your usual" their own
way: Cardio could fall back to non-TRIMP effort and knew no unknown days,
and both compared only through today. Tapping from Training Load to either
screen could therefore show a different percentage for the same week.

TrainingLoadLanes now holds the one strength and cardio lane computation,
read through any day. Training Load reads it through today. Cardio and
Strength read it through the selected week's Sunday, over their history
window plus the 84-day lookback a reading needs, and their load tiles and
coach context use it.

Analysis migration required: no
@DX23876
Merge branch 'redesign/a-lane-colors' into redesign/c-design-kit
51f79a5
@DX23876
feat(training): shared design kit for Training Load, Cardio and Strength
5d97dfb 
The three screens get one visual grammar while each keeps its own layout:
a lane hero card with status pill, count-up percentage and trend line,
a KPI strip, a load-over-time chart with 7D/4W/12W and the usual-week
band, summary tiles that open their full card, explainer rows that move
method text into sheets, a shared week control and a two-column layout
for wide windows. Blocks take finished values and only design tokens.
No screen uses them yet.

Analysis migration required: no
@DX23876
feat(training): rebuild Training Load on the shared design kit
8e0ea74 
The screen stacked thirteen full-width cards under a dual ring whose two
arcs and centre words were hard to tell apart. It now opens on two lane
cards (percentage, status, measured figure, trend, coverage, caveat and
the provisional strength amount), a maturity line, the duplicate and
overload notices, four tiles that open the full Adaptation, Recovery,
8-week and Session load cards, the development cards, week shape, and
explainer rows for maturity, data coverage and method.

The dual ring, its reading type and hero surface, the unused statement
and legend cards and the dial scale helpers are removed.

Analysis migration required: no
@DX23876
feat(cardio): rebuild the Cardio screen on the shared design kit
3390011 
The week now opens on the cardio load hero (the same reading Training
Load shows), the week's figures in a two-by-two strip with room for
four-digit distances, the load chart, intensity, and two tiles: the
sport carrying most of the week's measured load with its pace in that
sport's unit, and the week's average heart rate against the usual. The
load, bests and zone-provenance explanations move into explainer rows.

Adds CardioSession.loadShareBySport, weeklyPaceSecPerKm, weeklyAverageHr
and typicalWeeklyAverageHr with tests. The KPI strip, legend and tile
titles in the design kit get more room for long values and German labels.

Analysis migration required: no
Copilot AI balanced review requested due to automatic review settings September 17, 2026 16:26
Copilot AI reviewed Sep 17, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@DX23876 DX23876 mentioned this pull request Sep 17, 2026
Merged
@DX23876
DX23876 merged commit 3f136dd into main Sep 17, 2026
21 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort, defaults to Balanced
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@DX23876