Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

a11y: Reduce Transparency covers the Coach bars and the media badges, guard tests for both settings (#707, #708)

Duarte Santos19bf51854fad
diff --git a/frontend/src/a11y-contrast-transparency.test.js b/frontend/src/a11y-contrast-transparency.test.js
new file mode 100644
index 000000000..622a0e8ae
--- /dev/null
+++ b/frontend/src/a11y-contrast-transparency.test.js
@@ -0,0 +1,80 @@
+import { describe, expect, it } from 'vitest'
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+
+const read = (f) => readFileSync(resolve(process.cwd(), 'src', f), 'utf8').replace(/\/\*[\s\S]*?\*\//g, '')
+
+// The body of the first top-level block whose prelude matches `head`, braces counted.
+function block(css, head) {
+ const at = css.search(head)
+ if (at < 0) return ''
+ const open = css.indexOf('{', at)
+ let depth = 0
+ for (let i = open; i < css.length; i++) {
+ if (css[i] === '{') depth++
+ else if (css[i] === '}' && --depth === 0) return css.slice(open + 1, i)
+ }
+ return ''
+}
+const rule = (css, sel) => {
+ const esc = sel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+ return css.match(new RegExp(`(?:^|[}\\s])${esc}\\s*\\{([^}]*)\\}`))?.[1] || ''
+}
+const token = (decls, name) => decls.match(new RegExp(`${name}:\\s*([^;}]+)`))?.[1]?.trim()
+
+const hex = (h) => { h = h.replace('#', ''); if (h.length === 3) h = [...h].map((c) => c + c).join(''); return [0, 2, 4].map((i) => parseInt(h.slice(i, i + 2), 16)) }
+const rgba = (v) => { const m = v.match(/rgba\(([^)]+)\)/); const p = m[1].split(',').map(Number); return { rgb: p.slice(0, 3), a: p[3] } }
+const lum = (rgb) => { const l = rgb.map((c) => { c /= 255; return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4 }); return 0.2126 * l[0] + 0.7152 * l[1] + 0.0722 * l[2] }
+const ratio = (a, b) => { const x = lum(a), y = lum(b); return (Math.max(x, y) + 0.05) / (Math.min(x, y) + 0.05) }
+const over = ({ rgb, a }, bg) => rgb.map((c, i) => c * a + bg[i] * (1 - a))
+
+describe('Increase Contrast (#707)', () => {
+ const css = read('index.css')
+ const hc = block(css, /@media\s*\(prefers-contrast:\s*more\)/)
+ const themes = [
+ ['dark', rule(css, ':root'), rule(hc, ':root')],
+ ['light', rule(css, ':root[data-theme="light"]'), rule(hc, ':root[data-theme="light"]')],
+ ]
+
+ it.each(themes)('%s: secondary text reads at 4.5:1 on a card, hairlines get firmer', (_t, base, more) => {
+ expect(more).not.toBe('')
+ const card = hex(token(base, '--surface'))
+ expect(ratio(over(rgba(token(more, '--label-2')), card), card)).toBeGreaterThanOrEqual(4.5)
+ // label-3 is the tertiary text (hints, units): at least the large-text bar.
+ expect(ratio(over(rgba(token(more, '--label-3')), card), card)).toBeGreaterThanOrEqual(3)
+ for (const k of ['--label-2', '--label-3', '--sep', '--sep-op']) {
+ expect(rgba(token(more, k)).a, k).toBeGreaterThan(rgba(token(base, k)).a)
+ }
+ })
+
+ it('every accent keeps a 4.5:1 label on its filled button in both themes', () => {
+ const accents = [...css.matchAll(/:root\[data-accent="(\w+)"\]\s*\{\s*--acc:var\(--(\w+)\)[^}]*--on-acc:(#\w+)/g)]
+ expect(accents.length).toBeGreaterThanOrEqual(8)
+ const darkInk = token(rule(hc, ':root:not([data-theme="light"])'), '--on-acc')
+ const lightInks = Object.fromEntries([...css.matchAll(/((?::root\[data-theme="light"\]\[data-accent="\w+"\],?\s*)+)\{\s*--on-acc:(#\w+)/g)]
+ .flatMap((m) => [...m[1].matchAll(/data-accent="(\w+)"/g)].map((a) => [a[1], m[2]])))
+ for (const [, name, colour, ink] of accents) {
+ const dark = hex(token(rule(hc, ':root'), `--${colour}`))
+ const light = hex(token(rule(hc, ':root[data-theme="light"]'), `--${colour}`))
+ expect(ratio(hex(darkInk || ink), dark), `${name} dark`).toBeGreaterThanOrEqual(4.5)
+ expect(ratio(hex(lightInks[name] || ink), light), `${name} light`).toBeGreaterThanOrEqual(4.5)
+ }
+ })
+})
+
+describe('Reduce Transparency (#708)', () => {
+ // Every blurred surface in a sheet has to be listed in that sheet's own
+ // prefers-reduced-transparency block, with the blur off. A new frosted bar that forgets it
+ // stays see-through for the people who asked for less of exactly that.
+ it.each(['index.css', 'coach.css'])('%s: no surface keeps its blur', (file) => {
+ const css = read(file)
+ const reduce = block(css, /@media\s*\(prefers-reduced-transparency:\s*reduce\)/)
+ const off = [...reduce.matchAll(/([^{}]+)\{[^}]*(?:^|;)\s*backdrop-filter:none/g)]
+ .flatMap((m) => m[1].split(',').map((s) => s.trim()))
+ const blurred = [...css.matchAll(/([^{}]+)\{[^}]*backdrop-filter:[^;}]*blur\(/g)]
+ .flatMap((m) => m[1].split(',').map((s) => s.trim()))
+ .filter((s) => !s.startsWith('@'))
+ expect(blurred.length).toBeGreaterThan(0)
+ for (const sel of blurred) expect(off, sel).toContain(sel)
+ })
+})
diff --git a/frontend/src/coach.css b/frontend/src/coach.css
index d36841b62..bfe8e62e0 100644
--- a/frontend/src/coach.css
+++ b/frontend/src/coach.css
@@ -162,6 +162,10 @@
background:color-mix(in srgb,var(--bg) 88%,transparent);
-webkit-backdrop-filter:saturate(180%) blur(12px);backdrop-filter:saturate(180%) blur(12px)
}
+/* Reduce Transparency: the pinned title bar and the composer go solid, like the app's own bars. */
+@media (prefers-reduced-transparency: reduce){
+ .chat-hdr,.composer{-webkit-backdrop-filter:none;backdrop-filter:none;background:var(--bg)}
+}
/* The Android app reports the keyboard instead of shrinking the page (lib/native-keyboard.js):
the composer rides on top of it. */
:root[data-native-kb] .composer{bottom:var(--native-kb);padding-bottom:10px}
diff --git a/frontend/src/index.css b/frontend/src/index.css
index f46d4570f..f971a6902 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -515,6 +515,10 @@ h4.sec{
#timer{background:var(--surface)}
#toast{background:var(--surface-2)}
.conn-bar,.whdr.stick{background:var(--bg)}
+ /* The badges over an animation and the dim behind a sheet: no frost, and the badge gets a
+ darker pill so its white text no longer depends on what the picture shows behind it. */
+ .exmedia .gifhint,.exmedia .giftoggle,.mback{-webkit-backdrop-filter:none;backdrop-filter:none}
+ .exmedia .gifhint,.exmedia .giftoggle{background:rgba(0,0,0,.8)}
}
/* ------------------------------------------------------------ week strip -- */