diff --git a/app/lib/ui/status/run_status_icon.dart b/app/lib/ui/status/run_status_icon.dart index 6ebd0d00..61c74a6c 100644 --- a/app/lib/ui/status/run_status_icon.dart +++ b/app/lib/ui/status/run_status_icon.dart @@ -33,16 +33,19 @@ class RunStatusIcon extends StatelessWidget { } } -/// The dynamic colour for a run state, shared by every status glyph. +/// The colour for a run state, shared by every status glyph: green +/// succeeded, red failed, blue running, yellow waiting, orange interrupted, +/// grey otherwise, each with a brighter dark-mode shade. Color runStatusColor(String state, [ColorScheme? colorScheme]) { - final scheme = colorScheme ?? const ColorScheme.light(); + final dark = (colorScheme?.brightness ?? Brightness.light) == Brightness.dark; return switch (state) { - 'succeeded' => scheme.tertiary, - 'failed' => scheme.error, - 'running' || 'active' => scheme.primary, - 'waiting' => scheme.secondary, - 'interrupted' => scheme.tertiary, - _ => scheme.onSurfaceVariant, + 'succeeded' => dark ? const Color(0xFF30D158) : const Color(0xFF34C759), + 'failed' => dark ? const Color(0xFFFF453A) : const Color(0xFFFF3B30), + 'running' || + 'active' => dark ? const Color(0xFF0A84FF) : const Color(0xFF007AFF), + 'waiting' => dark ? const Color(0xFFFFD60A) : const Color(0xFFFFCC00), + 'interrupted' => dark ? const Color(0xFFFF9F0A) : const Color(0xFFFF9500), + _ => const Color(0xFF8E8E93), }; } diff --git a/app/test/features/graph/domain/run_graph_order_test.dart b/app/test/features/graph/domain/run_graph_order_test.dart index d7ea61c0..baf2c9ee 100644 --- a/app/test/features/graph/domain/run_graph_order_test.dart +++ b/app/test/features/graph/domain/run_graph_order_test.dart @@ -27,8 +27,8 @@ void main() { expect(graphStatusState('waiting'), 'waiting'); expect(graphStatusState('mystery'), 'unknown'); const scheme = ColorScheme.light(); - expect(runStatusColor('succeeded', scheme), scheme.tertiary); - expect(runStatusColor('waiting', scheme), scheme.secondary); - expect(runStatusColor('canceled', scheme), scheme.onSurfaceVariant); + expect(runStatusColor('succeeded', scheme), const Color(0xFF34C759)); + expect(runStatusColor('waiting', scheme), const Color(0xFFFFCC00)); + expect(runStatusColor('canceled', scheme), const Color(0xFF8E8E93)); }); }