diff --git a/art/build.py b/art/build.py index 244ce2a..b0e9160 100644 --- a/art/build.py +++ b/art/build.py @@ -789,11 +789,12 @@ def sent_strokes(): def ring(r): top,bottom=f'{f(cx)} {f(cy-r)}',f'{f(cx)} {f(cy+r)}' return f'M {top} A {f(r)} {f(r)} 0 1 1 {bottom} A {f(r)} {f(r)} 0 1 1 {top}',2*math.pi*r - # A finished ring is one colour, circle and tick together: Verdigris, the colour of done. - out=[(0,*ring(r),VERDIGRIS,sw) for r,sw in ((R,1.1),(R-6.5,.8),(R-9,.4))] + # A finished ring is one colour, circle and tick together: gold, the ring's colour while it + # works too. Verdigris is kept for money coming in. + out=[(0,*ring(r),GOLD,sw) for r,sw in ((R,1.1),(R-6.5,.8),(R-9,.4))] pts=[(cx-12.5,cy+1),(cx-4,cy+9.5),(cx+12.5,cy-8.5)] d='M '+' L '.join(f'{f(x)} {f(y)}' for x,y in pts) - return out+[(1,d,sum(math.dist(a,b) for a,b in zip(pts,pts[1:])),VERDIGRIS,1.9)] + return out+[(1,d,sum(math.dist(a,b) for a,b in zip(pts,pts[1:])),GOLD,1.9)] def scene_sent(): """The ring, closed, with a tick in it; a line of stars runs through, as on the Sent mock. The app shows it in layers (sent_sky, sent_graduations) and traces sent_strokes over them.""" diff --git a/docs/design/wizard-design-guide.md b/docs/design/wizard-design-guide.md index 33c29e2..9e6b7f0 100644 --- a/docs/design/wizard-design-guide.md +++ b/docs/design/wizard-design-guide.md @@ -48,7 +48,7 @@ Two themes: **Night** (below), the one the art and the store pages are drawn for | **Faint** | `#8790B8` | Hints, timestamps, placeholder | 6.0 | | **White** | `#FFFFFF` | The main action button only, with Night text | 18.8 | | **Gold** | `#E3B45C` | Accent: the ring, line art, links, progress. Never a filled button | 9.8 | -| **Verdigris** | `#6FCFB4` | Money received, success | 10.1 | +| **Verdigris** | `#6FCFB4` | Money coming in, the healthy status dot | 10.1 | | **Cinnabar** | `#F0806A` | Errors, destructive actions | 7.2 | - The three accents are alchemists' materials: gold, verdigris (the green on old copper) and cinnabar (the red ore of mercury). @@ -80,7 +80,7 @@ Screens name the role, never the theme's colour (`c.text`, not `color.star`). | **action** | White `#FFFFFF` | Night `#0B1026` | The main button's fill | 16.4 on Page | | **onAction** | Night `#0B1026` | Star `#F4EFE3` | The main button's words | 16.4 | | **accent** | Gold `#E3B45C` | Bronze `#7D5B18` | Links, the ring, progress, line art | 5.4 · 5.9 · 4.9 | -| **received** | Verdigris `#6FCFB4` | Verdigris `#196A53` | Money received, success | 5.7 · 6.2 · 5.1 | +| **received** | Verdigris `#6FCFB4` | Verdigris `#196A53` | Money coming in, the healthy status dot | 5.7 · 6.2 · 5.1 | | **danger** | Cinnabar `#F0806A` | Cinnabar `#B03A25` | Errors, destructive actions | 5.3 · 5.7 · 4.8 | - **The main action inverts.** On Night it is white with Night words; on Vellum it is Night with Star words. Either way it is the strongest shape on the screen, and there is still at most one. @@ -179,7 +179,8 @@ Screens name the role, never the theme's colour (`c.text`, not `color.star`). ## 7. Motifs **The ring.** A thin gold circle with small tick marks, like the edge of an astrolabe. It is the app's mark and its progress indicator. -- **Done is one colour.** A finished ring with a tick (Confirmed, Received, Sent) is Verdigris, circle and tick together, the same as money received (Pine in Vellum). Gold is the ring while it works: syncing, confirming, arriving. Two colours in one small mark read as two things (decided 2026-11-15). +- **Done is one colour, and it's gold.** A finished ring with a tick (Confirmed, Received, Sent, a paid request) is Gold, circle and tick together (Bronze in Vellum), the same as the ring while it works: syncing, confirming, arriving. The ring closing, the tick and the word say it finished; colour doesn't have to. Two colours in one small mark read as two things (decided 2026-11-15). +- **Verdigris means money coming in, and little else** (decided 2026-11-16, replacing Verdigris for done from 2026-11-15). Received amounts (`+ 0.05`), the received sign and a paid request's amount are Verdigris; so is the healthy dot beside a server, where it pairs with Gold for busy and Cinnabar for down. Switches, chosen ticks and done rings are Gold. A price that went up is the same colour as one that went down; its sign says which. - Sync: the ring fills clockwise; "Reading the chain · 62%". - Arriving money: a small ring next to the amount, filling as confirmations arrive. - Sent: the ring closes, then "Sent." diff --git a/mobile/app/(tabs)/index.tsx b/mobile/app/(tabs)/index.tsx index 7fbe759..5152519 100644 --- a/mobile/app/(tabs)/index.tsx +++ b/mobile/app/(tabs)/index.tsx @@ -179,11 +179,7 @@ export default function Home() { ) : null} {age ? {age} : null} - {change ? ( - - {change.text} - - ) : null} + {change ? {change.text} : null} {waitingForPrice ? ( Dollars appear once Wizard can get ZEC’s price. ) : null} @@ -349,7 +345,6 @@ const useStyles = themed((c) => balance: { alignItems: 'center', marginTop: 34, gap: 4 }, swap: { alignItems: 'center', gap: 4 }, second: { flexDirection: 'row', alignItems: 'center', gap: 6 }, - up: { color: c.received }, balanceText: { fontFamily: font.display, fontSize: size.balance, diff --git a/mobile/app/chart.tsx b/mobile/app/chart.tsx index d99bc8a..c490b70 100644 --- a/mobile/app/chart.tsx +++ b/mobile/app/chart.tsx @@ -124,7 +124,7 @@ export default function ChartScreen() { {change ? ( - {change.text} + {change.text} {label} {sub} - {value} + {value} ); } @@ -340,7 +338,6 @@ function InfoSheet({ label="ZEC’s price" sub={`${dollarsText(b.startPrice ?? 0)} → ${dollarsText(b.nowPrice ?? 0)}, on the ZEC you held`} value={signedCents(b.price ?? 0)} - green={(b.price ?? 0) >= 0} /> ) : null} color: c.muted, fontVariant: ['tabular-nums'], }, - up: { color: c.received }, info: { width: 44, height: 44, diff --git a/mobile/app/notifications.tsx b/mobile/app/notifications.tsx index 9c13451..b35c766 100644 --- a/mobile/app/notifications.tsx +++ b/mobile/app/notifications.tsx @@ -102,7 +102,7 @@ function ModeChoice({ {detail} - {selected ? : null} + {selected ? : null} ); @@ -378,7 +378,7 @@ export default function Notifications() { value={on} disabled={busy} onValueChange={(v) => (v ? turnOn() : turnOff())} - trackColor={{ true: c.received, false: c.line }} + trackColor={{ true: c.accent, false: c.line }} /> } /> @@ -401,7 +401,7 @@ export default function Notifications() { value={status.scanning} disabled={busy} onValueChange={setScanning} - trackColor={{ true: c.received, false: c.line }} + trackColor={{ true: c.accent, false: c.line }} /> } /> @@ -439,7 +439,7 @@ export default function Notifications() { value={status.showAmounts} disabled={busy} onValueChange={(v) => act(() => Wallet.lanternSetShowAmounts(v))} - trackColor={{ true: c.received, false: c.line }} + trackColor={{ true: c.accent, false: c.line }} /> } /> diff --git a/mobile/app/requests/[key].tsx b/mobile/app/requests/[key].tsx index a7ea46e..f8ec669 100644 --- a/mobile/app/requests/[key].tsx +++ b/mobile/app/requests/[key].tsx @@ -259,10 +259,10 @@ function Mark({ state }: { state: ReturnType['state'] }) { {state === 'paid' ? ( <> {/* Done is one colour, circle and tick together (design guide §7). */} - + {/* Done is one colour, circle and tick together (design guide §7). */} - + ', }, - 'mark/scroll': { - width: 48, - height: 48, - xml: '', - }, 'mark/staff': { width: 48, height: 48, @@ -325,28 +320,28 @@ export const traced = { step: 0, d: 'M 120 80 A 40 40 0 1 1 120 160 A 40 40 0 1 1 120 80', length: 251.33, - color: '__RECEIVED__', + color: '__ACCENT__', width: 1.1, }, { step: 0, d: 'M 120 86.5 A 33.5 33.5 0 1 1 120 153.5 A 33.5 33.5 0 1 1 120 86.5', length: 210.49, - color: '__RECEIVED__', + color: '__ACCENT__', width: 0.8, }, { step: 0, d: 'M 120 89 A 31 31 0 1 1 120 151 A 31 31 0 1 1 120 89', length: 194.78, - color: '__RECEIVED__', + color: '__ACCENT__', width: 0.4, }, { step: 1, d: 'M 107.5 121 L 116 129.5 L 132.5 111.5', length: 36.44, - color: '__RECEIVED__', + color: '__ACCENT__', width: 1.9, }, ], diff --git a/mobile/src/art/library.ts b/mobile/src/art/library.ts index 088395e..8e7019c 100644 --- a/mobile/src/art/library.ts +++ b/mobile/src/art/library.ts @@ -169,7 +169,7 @@ export const library = { 'scene/sent': { width: 240, height: 240, - xml: '', + xml: '', }, 'scene/counter': { width: 240, @@ -201,6 +201,11 @@ export const library = { height: 48, xml: '', }, + 'mark/scroll': { + width: 48, + height: 48, + xml: '', + }, 'mark/dove': { width: 48, height: 48, diff --git a/mobile/src/components/rows.tsx b/mobile/src/components/rows.tsx index 74301f3..c5168ff 100644 --- a/mobile/src/components/rows.tsx +++ b/mobile/src/components/rows.tsx @@ -132,7 +132,7 @@ export function SwitchItem({ diff --git a/mobile/src/request-row.tsx b/mobile/src/request-row.tsx index 14a6306..3ef63f7 100644 --- a/mobile/src/request-row.tsx +++ b/mobile/src/request-row.tsx @@ -96,10 +96,10 @@ function StateMark({ state }: { state: RequestStatus['state'] }) { > {state === 'paid' ? ( <> - +