diff --git a/app/lib/features/artifacts/actions/artifact_file_actions.dart b/app/lib/features/artifacts/actions/artifact_file_actions.dart index ea54b0dc..c2363367 100644 --- a/app/lib/features/artifacts/actions/artifact_file_actions.dart +++ b/app/lib/features/artifacts/actions/artifact_file_actions.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/adaptive/glass_bar.dart'; @@ -200,7 +199,6 @@ class _IconActions extends StatelessWidget { key: const Key('artifact-download'), label: 'Download', icon: Icons.download_outlined, - cupertinoIcon: CupertinoIcons.arrow_down_to_line, busy: busy, onPressed: busy ? null : controller.download, ), @@ -209,7 +207,6 @@ class _IconActions extends StatelessWidget { key: const Key('artifact-share'), label: 'Share', icon: Icons.share_outlined, - cupertinoIcon: CupertinoIcons.share, onPressed: busy ? null : controller.share, ), ], @@ -223,7 +220,6 @@ class ArtifactIconAction extends StatelessWidget { super.key, required this.label, required this.icon, - required this.cupertinoIcon, required this.onPressed, this.busy = false, }); @@ -231,9 +227,6 @@ class ArtifactIconAction extends StatelessWidget { final String label; final IconData icon; - /// Retained for callers that still pass the Cupertino glyph; the Material - /// action always draws [icon]. - final IconData cupertinoIcon; final VoidCallback? onPressed; final bool busy; diff --git a/app/lib/features/artifacts/ui/artifact_fullscreen.dart b/app/lib/features/artifacts/ui/artifact_fullscreen.dart index 3ac2d334..3362c4a4 100644 --- a/app/lib/features/artifacts/ui/artifact_fullscreen.dart +++ b/app/lib/features/artifacts/ui/artifact_fullscreen.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -34,7 +33,7 @@ class ArtifactFullscreenScope extends InheritedWidget { /// [cupertino] is retained for callers that still pass it; the route is always /// the Material one. Route artifactFullscreenRoute({ - required bool cupertino, + bool? cupertino, required WidgetBuilder builder, }) => MaterialPageRoute(fullscreenDialog: true, builder: builder); @@ -74,7 +73,6 @@ List artifactHtmlZoomActions(ValueNotifier zoom) { Key key, String label, IconData icon, - IconData cupertinoIcon, VoidCallback? onPressed, ) => SegmentedOverflowAction( key: key, @@ -83,12 +81,7 @@ List artifactHtmlZoomActions(ValueNotifier zoom) { icon: icon, onPressed: onPressed, ), - child: ArtifactIconAction( - label: label, - icon: icon, - cupertinoIcon: cupertinoIcon, - onPressed: onPressed, - ), + child: ArtifactIconAction(label: label, icon: icon, onPressed: onPressed), ); final value = zoom.value; return [ @@ -96,21 +89,18 @@ List artifactHtmlZoomActions(ValueNotifier zoom) { artifactZoomOutKey, 'Zoom out', Icons.zoom_out, - CupertinoIcons.zoom_out, value > artifactHtmlZoomSteps.first + 0.001 ? () => step(-1) : null, ), action( artifactZoomResetKey, 'Actual size ($percent)', Icons.restart_alt, - CupertinoIcons.arrow_counterclockwise, (value - 1).abs() > 0.001 ? () => zoom.value = 1 : null, ), action( artifactZoomInKey, 'Zoom in', Icons.zoom_in, - CupertinoIcons.zoom_in, value < artifactHtmlZoomSteps.last - 0.001 ? () => step(1) : null, ), ]; diff --git a/app/lib/features/artifacts/ui/artifact_viewer_bar.dart b/app/lib/features/artifacts/ui/artifact_viewer_bar.dart index fa6a7c61..c212199c 100644 --- a/app/lib/features/artifacts/ui/artifact_viewer_bar.dart +++ b/app/lib/features/artifacts/ui/artifact_viewer_bar.dart @@ -1,6 +1,5 @@ import 'dart:math' as math; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/adaptive/glass_bar.dart'; @@ -131,14 +130,12 @@ class ArtifactViewerBar extends StatelessWidget { key: const Key('artifact-open'), label: 'Open in browser', icon: Icons.open_in_new, - cupertinoIcon: CupertinoIcons.arrow_up_right_square, onPressed: onOpen, ), ArtifactIconAction( key: const Key('artifact-copy-link'), label: 'Copy link', icon: Icons.link, - cupertinoIcon: CupertinoIcons.link, onPressed: onCopy, ), ], @@ -147,9 +144,6 @@ class ArtifactViewerBar extends StatelessWidget { key: artifactFullscreenKey, label: fullscreen ? 'Exit full screen' : 'Full screen', icon: fullscreen ? Icons.fullscreen_exit : Icons.fullscreen, - cupertinoIcon: fullscreen - ? CupertinoIcons.fullscreen_exit - : CupertinoIcons.fullscreen, onPressed: toggle, ), ]; diff --git a/app/lib/features/artifacts/ui/artifact_viewer_body.dart b/app/lib/features/artifacts/ui/artifact_viewer_body.dart index c890866d..903ba0d9 100644 --- a/app/lib/features/artifacts/ui/artifact_viewer_body.dart +++ b/app/lib/features/artifacts/ui/artifact_viewer_body.dart @@ -1,6 +1,5 @@ import 'dart:typed_data'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/adaptive/floating_bar_layout.dart'; @@ -187,7 +186,6 @@ class ArtifactViewerInfoAction extends StatelessWidget { key: const Key('artifact-info'), label: 'Details', icon: Icons.info_outline, - cupertinoIcon: CupertinoIcons.info, onPressed: () => _show(context), ); } diff --git a/app/lib/features/schedules/ui/list/schedule_list_toolbar.dart b/app/lib/features/schedules/ui/list/schedule_list_toolbar.dart index d22a6eb5..d571e795 100644 --- a/app/lib/features/schedules/ui/list/schedule_list_toolbar.dart +++ b/app/lib/features/schedules/ui/list/schedule_list_toolbar.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../../ui/input/app_search_field.dart'; @@ -19,20 +18,19 @@ class ScheduleRefreshAction extends StatelessWidget { const ScheduleRefreshAction({ super.key, required this.controller, - required this.cupertino, + this.cupertino, required this.onRefresh, }); final SchedulesController controller; - final bool cupertino; + final bool? cupertino; final VoidCallback onRefresh; @override Widget build(BuildContext context) => BarIconButton( key: controller.isLoading ? null : scheduleRefreshKey, - cupertino: false, icon: Icons.refresh, - cupertinoIcon: CupertinoIcons.refresh, + cupertinoIcon: Icons.refresh, label: 'Refresh schedules', busy: controller.isLoading, busyLabel: 'Refreshing schedules', @@ -51,13 +49,13 @@ class ScheduleListToolbar extends StatelessWidget { super.key, required this.controller, required this.searchController, - required this.cupertino, + this.cupertino, this.onRefresh, }); final SchedulesController controller; final TextEditingController searchController; - final bool cupertino; + final bool? cupertino; final VoidCallback? onRefresh; @override @@ -69,7 +67,6 @@ class ScheduleListToolbar extends StatelessWidget { final refresh = switch (onRefresh) { final refresh? => ScheduleRefreshAction( controller: controller, - cupertino: false, onRefresh: refresh, ), null => null, @@ -119,7 +116,6 @@ class ScheduleListToolbar extends StatelessWidget { Widget _search(BuildContext context) => AppSearchField( fieldKey: scheduleSearchFieldKey, controller: searchController, - cupertino: false, placeholder: 'Search schedules', onChanged: controller.setQuery, onCleared: controller.clearQuery, diff --git a/app/lib/features/search/ui/search_bar_controls.dart b/app/lib/features/search/ui/search_bar_controls.dart index bb5908be..7b409fdf 100644 --- a/app/lib/features/search/ui/search_bar_controls.dart +++ b/app/lib/features/search/ui/search_bar_controls.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/input/app_search_field.dart'; @@ -21,7 +20,7 @@ const searchTokenHint = class SearchBarControls extends StatelessWidget { const SearchBarControls({ super.key, - required this.cupertino, + this.cupertino, required this.text, required this.kind, required this.onChanged, @@ -32,7 +31,7 @@ class SearchBarControls extends StatelessWidget { this.focusNode, }); - final bool cupertino; + final bool? cupertino; final TextEditingController text; final SearchKind kind; final ValueChanged onChanged; @@ -59,7 +58,6 @@ class SearchBarControls extends StatelessWidget { autofocus: autofocus, focusNode: focusNode, inBar: true, - cupertino: false, placeholder: 'Search pipelines, runs, artifacts and chats', onChanged: onChanged, onSubmitted: (_) => onSubmitted(), @@ -67,14 +65,13 @@ class SearchBarControls extends StatelessWidget { ), ), ), - SearchKindButton(cupertino: false, kind: kind, onSelected: onKind), + SearchKindButton(kind: kind, onSelected: onKind), BarIconButton( key: searchHelpKey, - cupertino: false, icon: Icons.info_outline, - cupertinoIcon: CupertinoIcons.info_circle, + cupertinoIcon: Icons.info_outline, label: 'Search syntax', - onPressed: () => showSearchHelp(context, cupertino: false), + onPressed: () => showSearchHelp(context), ), ], ), @@ -86,12 +83,12 @@ class SearchBarControls extends StatelessWidget { class SearchKindButton extends StatelessWidget { const SearchKindButton({ super.key, - required this.cupertino, + this.cupertino, required this.kind, required this.onSelected, }); - final bool cupertino; + final bool? cupertino; final SearchKind kind; final ValueChanged onSelected; @@ -131,7 +128,7 @@ class SearchKindButton extends StatelessWidget { } /// The query syntax, on demand instead of a paragraph above the results. -Future showSearchHelp(BuildContext context, {required bool cupertino}) { +Future showSearchHelp(BuildContext context, {bool? cupertino}) { return showDialog( context: context, builder: (context) => AlertDialog( diff --git a/app/lib/features/templates/ui/templates_frame.dart b/app/lib/features/templates/ui/templates_frame.dart index a5ba53f1..a678d69b 100644 --- a/app/lib/features/templates/ui/templates_frame.dart +++ b/app/lib/features/templates/ui/templates_frame.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../shell/shell_bar.dart'; @@ -88,7 +87,7 @@ class TemplatesFrame extends StatelessWidget { key: templatesRefreshKey, cupertino: false, icon: Icons.refresh, - cupertinoIcon: CupertinoIcons.refresh, + cupertinoIcon: Icons.refresh, label: 'Refresh', onPressed: refreshing ? null : onRefresh, ); diff --git a/app/notes/material-cleanup-feature-surface.md b/app/notes/material-cleanup-feature-surface.md new file mode 100644 index 00000000..649815fa --- /dev/null +++ b/app/notes/material-cleanup-feature-surface.md @@ -0,0 +1,16 @@ +# Material-only feature surface cleanup + +- Removed Cupertino imports and alternate glyph metadata from artifact viewer + actions, fullscreen zoom controls, and viewer controls. +- Made search, schedule-toolbar, and artifact fullscreen compatibility flags + optional and ignored while retaining shared adaptive API arguments required + by other lanes. Material icons are used for those required compatibility + glyph parameters. +- Focused checks: `tool/memwatch/full.sh` ran artifact actions/fullscreen and + controls, search bar layout, schedule refresh, and template layout tests: 30 + passed, 0 failed. +- `tool/analyze.sh`: clean. +- No rendered behavior was intentionally changed; controls remain the existing + Material widgets and layouts. +- Remaining shared compatibility metadata/flags are outside this focused edit + and should be removed only after all callers migrate during final integration.