Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions art/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down
7 changes: 4 additions & 3 deletions docs/design/wizard-design-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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."
Expand Down
7 changes: 1 addition & 6 deletions mobile/app/(tabs)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,7 @@ export default function Home() {
) : null}
</Animated.View>
{age ? <T kind="label">{age}</T> : null}
{change ? (
<T kind="label" style={change.up ? s.up : undefined}>
{change.text}
</T>
) : null}
{change ? <T kind="label">{change.text}</T> : null}
{waitingForPrice ? (
<T kind="label">Dollars appear once Wizard can get ZEC’s price.</T>
) : null}
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions mobile/app/chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default function ChartScreen() {
</View>
{change ? (
<View style={s.changeRow}>
<T style={[s.change, change.up && s.up]}>{change.text}</T>
<T style={s.change}>{change.text}</T>
<Pressable
accessibilityRole="button"
accessibilityLabel="How this is worked out"
Expand Down Expand Up @@ -264,13 +264,11 @@ function Row({
sub,
value,
strong,
green,
}: {
label: string;
sub: string;
value: string;
strong?: boolean;
green?: boolean;
}) {
const s = useStyles();
return (
Expand All @@ -279,7 +277,7 @@ function Row({
<T style={[s.rowLabel, strong && s.rowStrong]}>{label}</T>
<T style={s.rowSub}>{sub}</T>
</View>
<T style={[s.rowValue, strong && s.rowValueStrong, green && s.up]}>{value}</T>
<T style={[s.rowValue, strong && s.rowValueStrong]}>{value}</T>
</View>
);
}
Expand Down Expand Up @@ -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}
<Row
Expand Down Expand Up @@ -406,7 +403,6 @@ const useStyles = themed((c) =>
color: c.muted,
fontVariant: ['tabular-nums'],
},
up: { color: c.received },
info: {
width: 44,
height: 44,
Expand Down
8 changes: 4 additions & 4 deletions mobile/app/notifications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function ModeChoice({
<T kind="dust">{detail}</T>
</View>
<View style={s.check}>
{selected ? <Art name="sign/check" width={22} ink={c.received} /> : null}
{selected ? <Art name="sign/check" width={22} ink={c.accent} /> : null}
</View>
</Pressable>
);
Expand Down Expand Up @@ -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 }}
/>
}
/>
Expand All @@ -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 }}
/>
}
/>
Expand Down Expand Up @@ -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 }}
/>
}
/>
Expand Down
4 changes: 2 additions & 2 deletions mobile/app/requests/[key].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,10 @@ function Mark({ state }: { state: ReturnType<typeof requestStatus>['state'] }) {
{state === 'paid' ? (
<>
{/* Done is one colour, circle and tick together (design guide §7). */}
<Circle cx={9} cy={9} r={7.5} stroke={c.received} strokeWidth={1.3} fill="none" />
<Circle cx={9} cy={9} r={7.5} stroke={c.accent} strokeWidth={1.3} fill="none" />
<Path
d="M5.6 9.2l2.3 2.2 4.4-4.6"
stroke={c.received}
stroke={c.accent}
strokeWidth={1.6}
strokeLinecap="round"
strokeLinejoin="round"
Expand Down
4 changes: 2 additions & 2 deletions mobile/app/tx/[txid].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,10 @@ function Mark({ mark }: { mark: PageStatus['mark'] }) {
{mark === 'done' ? (
<>
{/* Done is one colour, circle and tick together (design guide §7). */}
<Circle cx={9} cy={9} r={7.5} stroke={c.received} strokeWidth={1.3} fill="none" />
<Circle cx={9} cy={9} r={7.5} stroke={c.accent} strokeWidth={1.3} fill="none" />
<Path
d="M5.6 9.2l2.3 2.2 4.4-4.6"
stroke={c.received}
stroke={c.accent}
strokeWidth={1.6}
strokeLinecap="round"
strokeLinejoin="round"
Expand Down
13 changes: 4 additions & 9 deletions mobile/src/art/generated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,6 @@ export const art = {
height: 48,
xml: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" fill="none"><g stroke-linecap="round" stroke-linejoin="round"><path d="M 9 19.5 C 7 31 14 40.5 24 40.5 C 34 40.5 41 31 39 19.5 M6 19.5L42 19.5 M15.4 38.4L13 43.4 M32.6 38.4L35 43.4" stroke="__ACCENT__" stroke-width="2.2" fill="none"/><path d="M 24 14 C 21.4 11.4 26.6 8.6 24 5" stroke="__ACCENT__" stroke-width="1.65" fill="none"/></g></svg>',
},
'mark/scroll': {
width: 48,
height: 48,
xml: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" fill="none"><g stroke-linecap="round" stroke-linejoin="round"><path d="M7 10L41 10 M7 38L41 38" stroke="__ACCENT__" stroke-width="2.86" fill="none"/><path d="M12 10L12 38 M36 10L36 38" stroke="__ACCENT__" stroke-width="2.2" fill="none"/><path d="M17.4 18.4L30.6 18.4 M17.4 24L27 24 M17.4 29.6L30.6 29.6" stroke="__ACCENT__" stroke-width="1.54" fill="none"/></g></svg>',
},
'mark/staff': {
width: 48,
height: 48,
Expand Down Expand Up @@ -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,
},
],
Expand Down
Loading
Loading