diff --git a/app/lib/features/pipelines/screen.dart b/app/lib/features/pipelines/screen.dart index 91c4e666..ac00caee 100644 --- a/app/lib/features/pipelines/screen.dart +++ b/app/lib/features/pipelines/screen.dart @@ -2,7 +2,6 @@ import '../../ui/adaptive/segmented_bar.dart'; import '../../shell/destination.dart'; import '../../shell/detail_page.dart'; import '../../shell/list_detail.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../core/api_gateway.dart'; @@ -329,7 +328,6 @@ class _PipelinesScreenState extends State { key: const Key('pipelines-refresh'), label: 'Refresh', icon: Icons.refresh, - cupertinoIcon: CupertinoIcons.refresh, onPressed: _controller.load, ); diff --git a/app/lib/features/pipelines/ui/run_pipeline_action.dart b/app/lib/features/pipelines/ui/run_pipeline_action.dart index 34535e2c..c0003966 100644 --- a/app/lib/features/pipelines/ui/run_pipeline_action.dart +++ b/app/lib/features/pipelines/ui/run_pipeline_action.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../core/api_gateway.dart'; @@ -176,7 +175,6 @@ class _RunPipelineActionState extends State { key: runPipelineActionKey, label: 'Run ${widget.detail.displayName}', icon: Icons.play_arrow_rounded, - cupertinoIcon: CupertinoIcons.play_fill, onPressed: _open, ); } diff --git a/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart b/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart index 9fd34cae..8b10f045 100644 --- a/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart +++ b/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/adaptive/segmented_bar_overflow.dart'; @@ -6,14 +5,13 @@ import '../../../ui/adaptive/segmented_bar_overflow.dart'; /// One icon action in the Pipelines bar's actions pill: a Material /// [IconButton] with its tooltip. A narrow bar moves it into its More menu. /// -/// [cupertinoIcon] is retained in the signature for callers that still pass -/// it; the Material icon is drawn. Widget pipelineBarIconButton( BuildContext context, { required Key key, required String label, required IconData icon, - required IconData cupertinoIcon, + // Compatibility for callers outside this lane; Material is always drawn. + IconData? cupertinoIcon, required VoidCallback? onPressed, }) { return SegmentedOverflowAction( @@ -44,7 +42,6 @@ Widget pipelineSchedulesButton(BuildContext context, VoidCallback? onPressed) => key: const Key('pipelines-open-schedules'), label: 'Schedules', icon: Icons.schedule, - cupertinoIcon: CupertinoIcons.calendar, onPressed: onPressed, ); @@ -55,6 +52,5 @@ Widget pipelineSettingsButton(BuildContext context, VoidCallback? onPressed) => key: const Key('pipelines-open-settings'), label: 'Settings', icon: Icons.settings_outlined, - cupertinoIcon: CupertinoIcons.gear, onPressed: onPressed, ); diff --git a/app/lib/features/pipelines/widgets/pipeline_detail_panel.dart b/app/lib/features/pipelines/widgets/pipeline_detail_panel.dart index 71503deb..9a26ecc0 100644 --- a/app/lib/features/pipelines/widgets/pipeline_detail_panel.dart +++ b/app/lib/features/pipelines/widgets/pipeline_detail_panel.dart @@ -1,7 +1,6 @@ import '../../../core/servers/server_context.dart'; import 'dart:math' as math; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../core/api_gateway.dart'; @@ -409,7 +408,6 @@ class _PipelineDetailPanelState extends State { ? 'View runs of this pipeline' : 'View runs of ${detail.name}', icon: Icons.list_alt_outlined, - cupertinoIcon: CupertinoIcons.list_bullet, onPressed: widget.onViewPipelineRuns == null ? null : () => widget.onViewPipelineRuns!(detail.id), diff --git a/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart b/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart index 56b649b8..66c03795 100644 --- a/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart +++ b/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart @@ -1,20 +1,16 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; /// The detail sections: Summary, the pinned definition Graph and Source. enum PipelineDetailTab { - summary('Summary', Icons.summarize_outlined, CupertinoIcons.doc_text), - graph('Graph', Icons.hub_outlined, CupertinoIcons.flowchart), - source('Source', Icons.code, CupertinoIcons.chevron_left_slash_chevron_right); + summary('Summary', Icons.summarize_outlined), + graph('Graph', Icons.hub_outlined), + source('Source', Icons.code); - const PipelineDetailTab(this.label, this.icon, this.cupertinoIcon); + const PipelineDetailTab(this.label, this.icon); final String label; /// The tab's glyph, the only thing the bottom bar draws (the label is its /// accessible name); distinct from the shell's Pipelines tab beneath it. final IconData icon; - - /// Retained for callers; the Material [icon] is drawn. - final IconData cupertinoIcon; } diff --git a/app/lib/features/runs/actions/decision_action.dart b/app/lib/features/runs/actions/decision_action.dart index 3c1f2bdd..51ac651c 100644 --- a/app/lib/features/runs/actions/decision_action.dart +++ b/app/lib/features/runs/actions/decision_action.dart @@ -62,7 +62,6 @@ class _HumanDecisionActionState extends State { context: context, run: widget.run, gateway: widget.gateway, - cupertino: widget.cupertino ?? false, onRunChanged: _acceptRun, isCurrent: () => _owns(decision.runId), ); @@ -104,7 +103,7 @@ Future showRunDecisionPrompt({ required JsonMap run, required ApiGateway gateway, required ValueChanged onRunChanged, - required bool cupertino, + bool? cupertino, bool Function()? isCurrent, }) async { final decision = pendingDecision(run); @@ -118,7 +117,6 @@ Future showRunDecisionPrompt({ await showHumanDecisionPrompt( context: context, decision: decision, - cupertino: cupertino, onSubmit: submission.submit, ); } diff --git a/app/lib/features/runs/actions/decision_dialog.dart b/app/lib/features/runs/actions/decision_dialog.dart index 9f477a5e..d8c11988 100644 --- a/app/lib/features/runs/actions/decision_dialog.dart +++ b/app/lib/features/runs/actions/decision_dialog.dart @@ -14,7 +14,7 @@ typedef DecisionSubmit = Future Function(DecisionDraft draft); Future showHumanDecisionPrompt({ required BuildContext context, required PendingDecision decision, - required bool cupertino, + bool? cupertino, required DecisionSubmit onSubmit, }) { final prompt = _DecisionPrompt(decision: decision, onSubmit: onSubmit); diff --git a/app/lib/features/runs/screen.dart b/app/lib/features/runs/screen.dart index dddf8a1d..79a87e73 100644 --- a/app/lib/features/runs/screen.dart +++ b/app/lib/features/runs/screen.dart @@ -7,7 +7,6 @@ import '../../shell/destination.dart'; import '../../shell/detail_page.dart'; import '../../shell/empty_detail_pane.dart'; import '../../shell/list_detail.dart'; -import '../../ui/adaptive/host.dart'; import '../attention/notify/notification_controller.dart'; import '../../ui/layout/content_width.dart'; import '../attention/runtime/attention_controller.dart'; @@ -219,7 +218,6 @@ class _RunsScreenState extends State { run: current, gateway: widget.gateway, onRunChanged: controller.acceptRunDetail, - cupertino: usesCupertinoHost(context), isCurrent: () => mounted && controller.selectedRunId == selected, ), ); diff --git a/app/lib/features/runs/ui/run_decision_notice.dart b/app/lib/features/runs/ui/run_decision_notice.dart index 21310fc4..1a2f2748 100644 --- a/app/lib/features/runs/ui/run_decision_notice.dart +++ b/app/lib/features/runs/ui/run_decision_notice.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart' show CupertinoColors; import 'package:flutter/material.dart'; import '../../../core/api_gateway.dart'; @@ -26,7 +25,7 @@ class RunDecisionNotice extends StatelessWidget { // colour, the title over its meta line, and the action on the trailing // edge. The strip is already the frame, so the banner draws no card, // border or tint of its own. - final color = CupertinoColors.systemTeal.resolveFrom(context); + final color = Theme.of(context).colorScheme.tertiary; final metaStyle = Theme.of(context).textTheme.bodySmall; return Container( key: const Key('run-decision-banner'), diff --git a/app/lib/features/runs/ui/run_detail_tab.dart b/app/lib/features/runs/ui/run_detail_tab.dart index 339a7cad..2b5eb319 100644 --- a/app/lib/features/runs/ui/run_detail_tab.dart +++ b/app/lib/features/runs/ui/run_detail_tab.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; /// The run-detail sections in the web's order: Summary first, the run Graph @@ -8,23 +7,17 @@ import 'package:flutter/material.dart'; /// are the same words. `renderedRunDetailTabs` decides which keys the strip /// draws, so Input and Output stay addressable without being tabs. enum RunDetailTab { - summary('Summary', Icons.summarize_outlined, CupertinoIcons.doc_text), - graph('Graph', Icons.account_tree_outlined, CupertinoIcons.arrow_branch), - input('Input', Icons.input, CupertinoIcons.arrow_down_doc), - output('Output', Icons.output, CupertinoIcons.arrow_up_doc), - timeline('Timeline', Icons.timeline, CupertinoIcons.list_bullet), - artifacts('Artifacts', Icons.inventory_2_outlined, CupertinoIcons.cube_box), - changes( - 'Changes', - Icons.difference_outlined, - CupertinoIcons.arrow_right_arrow_left, - ); + summary('Summary', Icons.summarize_outlined), + graph('Graph', Icons.account_tree_outlined), + input('Input', Icons.input), + output('Output', Icons.output), + timeline('Timeline', Icons.timeline), + artifacts('Artifacts', Icons.inventory_2_outlined), + changes('Changes', Icons.difference_outlined); - const RunDetailTab(this.label, this.icon, this.cupertinoIcon); + const RunDetailTab(this.label, this.icon); final String label; - /// The tab's glyph, so a tab is recognisable at a glance. final IconData icon; - final IconData cupertinoIcon; } diff --git a/app/lib/features/runs/ui/run_detail_visit_sections.dart b/app/lib/features/runs/ui/run_detail_visit_sections.dart index 20ba06cc..16fc233e 100644 --- a/app/lib/features/runs/ui/run_detail_visit_sections.dart +++ b/app/lib/features/runs/ui/run_detail_visit_sections.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -18,30 +17,20 @@ import '../../../ui/adaptive/floating_bar_layout.dart'; /// client follows: the turn's Input and Output, its Artifacts, the files this /// visit changed, its Session and the authored Definition. enum RunVisitSection { - summary('Summary', Icons.summarize_outlined, CupertinoIcons.doc_text), - more('More', Icons.more_horiz, CupertinoIcons.ellipsis_circle), - input('Input', Icons.input, CupertinoIcons.arrow_down_doc), - output('Output', Icons.output, CupertinoIcons.arrow_up_doc), - artifacts('Artifacts', Icons.inventory_2_outlined, CupertinoIcons.cube_box), - changes( - 'Changes', - Icons.difference_outlined, - CupertinoIcons.arrow_right_arrow_left, - ), - session('Session', Icons.forum_outlined, CupertinoIcons.text_bubble), - definition( - 'Definition', - Icons.description_outlined, - CupertinoIcons.doc_plaintext, - ); + summary('Summary', Icons.summarize_outlined), + more('More', Icons.more_horiz), + input('Input', Icons.input), + output('Output', Icons.output), + artifacts('Artifacts', Icons.inventory_2_outlined), + changes('Changes', Icons.difference_outlined), + session('Session', Icons.forum_outlined), + definition('Definition', Icons.description_outlined); - const RunVisitSection(this.label, this.icon, this.cupertinoIcon); + const RunVisitSection(this.label, this.icon); final String label; - /// The section's glyph, so a tab is recognisable at a glance. final IconData icon; - final IconData cupertinoIcon; } /// The stage page's tabs: the app's floating glass tab bar, full width on a diff --git a/app/notes/material-cleanup-runs-pipelines.md b/app/notes/material-cleanup-runs-pipelines.md new file mode 100644 index 00000000..e325f62a --- /dev/null +++ b/app/notes/material-cleanup-runs-pipelines.md @@ -0,0 +1,14 @@ +# Material cleanup: runs and pipelines + +- Removed Cupertino imports, alternate icon metadata, and the Cupertino + separator/teal color use from the assigned runs and pipelines widgets. +- Kept `pipelineBarIconButton`'s optional ignored `cupertinoIcon` parameter for + callers in other feature lanes; it has no rendering effect and can be removed + after those callers migrate. +- Updated the mirrored path and icon-bar tests to assert Material-rendered + behavior without Cupertino expectations. +- Focused checks: `tool/memwatch/full.sh` with the four affected feature tests + plus `test/ui/adaptive/icon_only_tab_bars_test.dart`: 28 passed, 0 failed. +- Analyzer: `tool/analyze.sh` clean. +- No UI redesign or capture was performed; changes preserve existing layout and + interactions apart from removing unused alternate-host data. diff --git a/app/test/features/runs/ui/run_path_mini_test.dart b/app/test/features/runs/ui/run_path_mini_test.dart index 0acebc78..3b5f71a2 100644 --- a/app/test/features/runs/ui/run_path_mini_test.dart +++ b/app/test/features/runs/ui/run_path_mini_test.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/runs/ui/run_path_mini.dart'; +import 'package:pipelines_app/ui/status/run_status_icon.dart'; void main() { final run = { @@ -44,7 +45,13 @@ void main() { final scheme = Theme.of( tester.element(find.byKey(const Key('run-path-mini'))), ).colorScheme; - expect(colors, contains(scheme.tertiary.toARGB32())); - expect(colors, contains(scheme.error.toARGB32())); + expect( + colors, + contains(runStatusColor('succeeded', scheme).toARGB32()), + ); + expect( + colors, + contains(runStatusColor('failed', scheme).toARGB32()), + ); }); } diff --git a/app/test/ui/adaptive/icon_only_tab_bars_test.dart b/app/test/ui/adaptive/icon_only_tab_bars_test.dart index c85a2a1f..1c866b6b 100644 --- a/app/test/ui/adaptive/icon_only_tab_bars_test.dart +++ b/app/test/ui/adaptive/icon_only_tab_bars_test.dart @@ -119,19 +119,12 @@ void main() { final shell = { for (final destination in shellTabDestinations) ...[ destinationDetails(destination).icon, - destinationDetails(destination).cupertinoIcon, ], }; final details = [ - for (final tab in renderedRunDetailTabs) ...[tab.icon, tab.cupertinoIcon], - for (final section in shownVisitSections) ...[ - section.icon, - section.cupertinoIcon, - ], - for (final tab in PipelineDetailTab.values) ...[ - tab.icon, - tab.cupertinoIcon, - ], + for (final tab in renderedRunDetailTabs) tab.icon, + for (final section in shownVisitSections) ...[section.icon], + for (final tab in PipelineDetailTab.values) tab.icon, ]; for (final icon in details) { expect(shell.contains(icon), isFalse, reason: '$icon');