From d1b05217c9bfe99c98d8dd72ecf770e12d25896b Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Wed, 11 Nov 2026 04:53:12 +0000 Subject: [PATCH] Remove Cupertino pipeline branches Keep the pipeline feature on its existing Material path because the app runs under MaterialApp and never selects Cupertino hosts. Preserve public cupertino parameters and required Cupertino icon values for later cleanup and shared controls. --- app/lib/features/pipelines/screen.dart | 21 +- .../pipelines/ui/run_pipeline_action.dart | 8 - .../pipelines/ui/run_pipeline_dialog.dart | 55 +---- .../pipelines/ui/run_pipeline_fields.dart | 230 +++--------------- .../widgets/pipeline_archive_action.dart | 77 ++---- .../widgets/pipeline_bar_buttons.dart | 35 +-- .../pipelines/widgets/pipeline_controls.dart | 78 +----- .../pipeline_definition_validation.dart | 15 +- .../widgets/pipeline_detail_styles.dart | 22 +- .../widgets/pipeline_detail_tab.dart | 2 + .../pipeline_filter_cupertino_body.dart | 129 ---------- .../widgets/pipeline_filter_page.dart | 82 ++----- .../pipelines/widgets/pipeline_graph_tab.dart | 10 - .../widgets/pipeline_list_panel.dart | 66 ++--- .../widgets/pipeline_scope_control.dart | 95 ++------ .../widgets/pipeline_summary_view.dart | 9 +- .../pipelines/widgets/pipeline_tabs.dart | 6 +- .../pipelines_registration_test.dart | 136 +++++------ app/test/application/settings_page_test.dart | 125 +++++----- .../settings_registration_test.dart | 153 ++++++------ .../tab_location_navigation_test.dart | 107 ++++---- .../pipelines/pipeline_archive_test.dart | 32 +-- .../pipeline_definition_warnings_test.dart | 46 ++-- .../pipeline_list_composition_test.dart | 32 --- .../pipeline_scope_control_test.dart | 60 ++--- .../pipelines/pipeline_summary_flat_test.dart | 117 +++++---- .../pipelines/pipeline_tabs_test.dart | 105 ++++---- .../pipelines/pipelines_adaptive_test.dart | 64 ----- .../pipelines_screen_filter_test.dart | 29 +-- .../ui/run_pipeline_launch_test.dart | 78 +----- .../ui/adaptive/icon_only_tab_bars_test.dart | 2 + 31 files changed, 557 insertions(+), 1469 deletions(-) delete mode 100644 app/lib/features/pipelines/widgets/pipeline_filter_cupertino_body.dart diff --git a/app/lib/features/pipelines/screen.dart b/app/lib/features/pipelines/screen.dart index b445dad9..91c4e666 100644 --- a/app/lib/features/pipelines/screen.dart +++ b/app/lib/features/pipelines/screen.dart @@ -13,7 +13,6 @@ import 'pipeline_repository.dart'; import 'pipelines_controller.dart'; import 'pending_run_store.dart'; import 'widgets/pipeline_bar_buttons.dart'; -import 'widgets/pipeline_controls.dart'; import 'widgets/pipeline_detail_panel.dart'; import 'widgets/pipeline_list_panel.dart'; @@ -273,9 +272,7 @@ class _PipelinesScreenState extends State { }, ); if (widget.embedded) return _embeddedBody(context, body); - return useCupertinoControls(context) - ? _cupertinoShell(context, body) - : _materialShell(context, body); + return _materialShell(context, body); }, ); } @@ -352,20 +349,4 @@ class _PipelinesScreenState extends State { body: SafeArea(top: false, child: body), ); } - - Widget _cupertinoShell(BuildContext context, Widget body) { - return CupertinoPageScaffold( - navigationBar: SegmentedBar( - cupertino: true, - title: 'Pipelines', - actions: [ - ...pipelineListActions(context, _controller), - if (widget.onOpenSchedules != null) _schedulesButton(context), - _refreshButton(context), - if (widget.onOpenSettings != null) _settingsButton(context), - ], - ), - child: SafeArea(top: false, child: body), - ); - } } diff --git a/app/lib/features/pipelines/ui/run_pipeline_action.dart b/app/lib/features/pipelines/ui/run_pipeline_action.dart index 64040ed8..34535e2c 100644 --- a/app/lib/features/pipelines/ui/run_pipeline_action.dart +++ b/app/lib/features/pipelines/ui/run_pipeline_action.dart @@ -8,7 +8,6 @@ import '../pipeline_models.dart'; import '../pipelines_controller.dart'; import '../run_pipeline_intent.dart'; import '../widgets/pipeline_bar_buttons.dart'; -import '../widgets/pipeline_controls.dart'; import 'run_pipeline_dialog.dart'; import 'run_pipeline_wording.dart'; @@ -181,13 +180,6 @@ class _RunPipelineActionState extends State { onPressed: _open, ); } - if (useCupertinoControls(context)) { - return CupertinoButton.filled( - key: runPipelineActionKey, - onPressed: _open, - child: label, - ); - } return FilledButton( key: runPipelineActionKey, onPressed: _open, diff --git a/app/lib/features/pipelines/ui/run_pipeline_dialog.dart b/app/lib/features/pipelines/ui/run_pipeline_dialog.dart index b13fb001..3155f854 100644 --- a/app/lib/features/pipelines/ui/run_pipeline_dialog.dart +++ b/app/lib/features/pipelines/ui/run_pipeline_dialog.dart @@ -1,13 +1,11 @@ import '../../schedules/data/schedules_repository.dart'; import '../../schedules/domain/editor/schedule_draft.dart'; import '../../schedules/ui/pipeline/schedule_pipeline_editor.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../core/servers/server_scope.dart'; import '../../../core/api_gateway.dart'; import '../../settings/settings_store.dart'; -import '../../../ui/adaptive/host.dart'; import '../pipeline_models.dart'; import '../run_pipeline_intent.dart'; import 'run_pipeline_fields.dart'; @@ -45,23 +43,16 @@ Future showRunPipelineDialog({ detail: detail, gateway: gateway, pending: pending, - cupertino: usesCupertinoHost(context), onSubmit: onSubmit, onPendingChanged: onPendingChanged, onAccepted: onAccepted, onSchedule: schedule, ); - return dialog.cupertino - ? showCupertinoDialog( - context: context, - barrierDismissible: false, - builder: (_) => dialog, - ) - : showDialog( - context: context, - barrierDismissible: false, - builder: (_) => dialog, - ); + return showDialog( + context: context, + barrierDismissible: false, + builder: (_) => dialog, + ); } class _RunPipelineDialog extends StatefulWidget { @@ -69,7 +60,6 @@ class _RunPipelineDialog extends StatefulWidget { required this.detail, required this.gateway, required this.pending, - required this.cupertino, required this.onSubmit, required this.onPendingChanged, required this.onAccepted, @@ -81,7 +71,6 @@ class _RunPipelineDialog extends StatefulWidget { final PipelineDetail detail; final ApiGateway gateway; final RunPipelineIntent? pending; - final bool cupertino; final Future Function(RunPipelineIntent intent) onSubmit; final ValueChanged onPendingChanged; final ValueChanged onAccepted; @@ -219,8 +208,7 @@ class _RunPipelineDialogState extends State<_RunPipelineDialog> { @override Widget build(BuildContext context) { - final dialog = widget.cupertino ? _cupertino(context) : _material(context); - return PopScope(canPop: !_sending, child: dialog); + return PopScope(canPop: !_sending, child: _material(context)); } Widget _material(BuildContext context) { @@ -248,31 +236,6 @@ class _RunPipelineDialogState extends State<_RunPipelineDialog> { ); } - Widget _cupertino(BuildContext context) { - return CupertinoAlertDialog( - title: Text(runPipelineDialogTitle(widget.detail.name)), - content: _content(context), - actions: [ - CupertinoDialogAction( - key: runPipelineCancelKey, - onPressed: _sending ? null : _cancel, - child: const Text(runPipelineCancelLabel), - ), - CupertinoDialogAction( - key: const Key('run-pipeline-schedule'), - onPressed: _sending ? null : _schedule, - child: const Text('Schedule…'), - ), - CupertinoDialogAction( - key: runPipelineConfirmKey, - isDefaultAction: true, - onPressed: _sending ? null : _confirm, - child: Text(_confirmLabel), - ), - ], - ); - } - /// Leaves the dialog for the schedule editor with the typed prompt, /// workspace and the pinned version. void _schedule() { @@ -294,9 +257,7 @@ class _RunPipelineDialogState extends State<_RunPipelineDialog> { } Widget _content(BuildContext context) { - final errorStyle = widget.cupertino - ? TextStyle(color: CupertinoColors.systemRed.resolveFrom(context)) - : TextStyle(color: Theme.of(context).colorScheme.error); + final errorStyle = TextStyle(color: Theme.of(context).colorScheme.error); return Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch, @@ -305,7 +266,7 @@ class _RunPipelineDialogState extends State<_RunPipelineDialog> { prompt: _prompt, workspace: _workspace, directories: _directories, - cupertino: widget.cupertino, + cupertino: false, onChooseDirectory: _chooseDirectory, notifyMode: _notify, outputFormat: _outputFormat, diff --git a/app/lib/features/pipelines/ui/run_pipeline_fields.dart b/app/lib/features/pipelines/ui/run_pipeline_fields.dart index bd77c202..387a3237 100644 --- a/app/lib/features/pipelines/ui/run_pipeline_fields.dart +++ b/app/lib/features/pipelines/ui/run_pipeline_fields.dart @@ -1,11 +1,9 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../../../ui/adaptive/host.dart'; import '../run_pipeline_intent.dart'; import 'run_pipeline_wording.dart'; -/// The dialog's three web fields, in the host's native controls. +/// The dialog's three web fields in standard Material controls. /// /// A confirmed launch locks every field: the request is immutable until its /// admission is known, exactly like the browser's disabled inputs. @@ -27,7 +25,10 @@ class RunPipelineFields extends StatelessWidget { final TextEditingController prompt; final TextEditingController workspace; final List directories; + + /// Retained for callers; the fields are Material on every host. final bool cupertino; + final ValueChanged onChooseDirectory; final RunNotifyMode notifyMode; final RunOutputFormat outputFormat; @@ -37,44 +38,28 @@ class RunPipelineFields extends StatelessWidget { @override Widget build(BuildContext context) { - final cupertino = usesCupertinoHost(context); return Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - _FieldLabel(runPipelinePromptLabel, cupertino: cupertino), - _promptField(context, cupertino), + const _FieldLabel(runPipelinePromptLabel), + _promptField(), const SizedBox(height: 12), - _FieldLabel(runPipelineWorkspaceLabel, cupertino: cupertino), - _workspaceField(context, cupertino), - _helper(context, runPipelineWorkspaceHelper, cupertino), + const _FieldLabel(runPipelineWorkspaceLabel), + _workspaceField(), + _helper(context, runPipelineWorkspaceHelper), const SizedBox(height: 12), - _FieldLabel(runPipelineNotifyLabel, cupertino: cupertino), - _notifyField(context, cupertino), + const _FieldLabel(runPipelineNotifyLabel), + _notifyField(), const SizedBox(height: 12), - _FieldLabel(runPipelineOutputFormatLabel, cupertino: cupertino), - _outputFormatField(context, cupertino), - _helper(context, runPipelineOutputFormatHelper, cupertino), + const _FieldLabel(runPipelineOutputFormatLabel), + _outputFormatField(), + _helper(context, runPipelineOutputFormatHelper), ], ); } - Widget _promptField(BuildContext context, bool cupertino) { - if (cupertino) { - return CupertinoTextField( - key: runPipelinePromptKey, - controller: prompt, - placeholder: runPipelinePromptPlaceholder, - placeholderStyle: _cupertinoPlaceholder(context), - style: CupertinoTheme.of(context).textTheme.textStyle, - minLines: 3, - maxLines: 5, - enabled: !locked, - autofocus: !locked, - padding: const EdgeInsets.all(8), - textCapitalization: TextCapitalization.sentences, - ); - } + Widget _promptField() { return TextField( key: runPipelinePromptKey, controller: prompt, @@ -90,51 +75,26 @@ class RunPipelineFields extends StatelessWidget { ); } - Widget _workspaceField(BuildContext context, bool cupertino) { - final field = cupertino - ? _cupertinoWorkspace(context) - : _materialWorkspace(); + Widget _workspaceField() { return Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded(child: field), + Expanded(child: _materialWorkspace()), if (directories.isNotEmpty) - cupertino - ? CupertinoButton( - key: runPipelineWorkspaceSuggestionsKey, - padding: EdgeInsets.zero, - onPressed: locked - ? null - : () => _chooseCupertinoDirectory(context), - child: const Icon(CupertinoIcons.folder), - ) - : PopupMenuButton( - key: runPipelineWorkspaceSuggestionsKey, - tooltip: runPipelineWorkspaceLabel, - enabled: !locked, - onSelected: onChooseDirectory, - itemBuilder: (_) => [ - for (final path in directories) - PopupMenuItem(value: path, child: Text(path)), - ], - ), + PopupMenuButton( + key: runPipelineWorkspaceSuggestionsKey, + tooltip: runPipelineWorkspaceLabel, + enabled: !locked, + onSelected: onChooseDirectory, + itemBuilder: (_) => [ + for (final path in directories) + PopupMenuItem(value: path, child: Text(path)), + ], + ), ], ); } - Widget _cupertinoWorkspace(BuildContext context) { - return CupertinoTextField( - key: runPipelineWorkspaceKey, - controller: workspace, - placeholder: runPipelineWorkspacePlaceholder, - placeholderStyle: _cupertinoPlaceholder(context), - style: CupertinoTheme.of(context).textTheme.textStyle, - enabled: !locked, - autocorrect: false, - padding: const EdgeInsets.all(8), - ); - } - Widget _materialWorkspace() { return TextField( key: runPipelineWorkspaceKey, @@ -148,44 +108,7 @@ class RunPipelineFields extends StatelessWidget { ); } - Future _chooseCupertinoDirectory(BuildContext context) async { - final chosen = await showCupertinoModalPopup( - context: context, - builder: (sheetContext) => CupertinoActionSheet( - title: const Text(runPipelineWorkspaceLabel), - actions: [ - for (final path in directories) - CupertinoActionSheetAction( - onPressed: () => Navigator.of(sheetContext).pop(path), - child: Text(path), - ), - ], - cancelButton: CupertinoActionSheetAction( - onPressed: () => Navigator.of(sheetContext).pop(), - child: const Text(runPipelineCancelLabel), - ), - ), - ); - if (chosen != null) onChooseDirectory(chosen); - } - - Widget _notifyField(BuildContext context, bool cupertino) { - if (cupertino) { - return CupertinoButton( - key: runPipelineNotifyKey, - padding: EdgeInsets.zero, - alignment: AlignmentDirectional.centerStart, - onPressed: locked ? null : () => _chooseNotify(context), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Flexible(child: Text(notifyMode.label)), - const SizedBox(width: 4), - const Icon(CupertinoIcons.chevron_down, size: 14), - ], - ), - ); - } + Widget _notifyField() { return DropdownButtonFormField( key: runPipelineNotifyKey, initialValue: notifyMode, @@ -202,45 +125,7 @@ class RunPipelineFields extends StatelessWidget { ); } - Future _chooseNotify(BuildContext context) async { - final chosen = await showCupertinoModalPopup( - context: context, - builder: (sheetContext) => CupertinoActionSheet( - title: const Text(runPipelineNotifyLabel), - actions: [ - for (final mode in RunNotifyMode.values) - CupertinoActionSheetAction( - onPressed: () => Navigator.of(sheetContext).pop(mode), - child: Text(mode.label), - ), - ], - cancelButton: CupertinoActionSheetAction( - isDefaultAction: true, - onPressed: () => Navigator.of(sheetContext).pop(), - child: const Text(runPipelineCancelLabel), - ), - ), - ); - if (chosen != null) onNotifyChanged(chosen); - } - - Widget _outputFormatField(BuildContext context, bool cupertino) { - if (cupertino) { - return CupertinoButton( - key: runPipelineOutputFormatKey, - padding: EdgeInsets.zero, - alignment: AlignmentDirectional.centerStart, - onPressed: locked ? null : () => _chooseOutputFormat(context), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Flexible(child: Text(outputFormat.label)), - const SizedBox(width: 4), - const Icon(CupertinoIcons.chevron_down, size: 14), - ], - ), - ); - } + Widget _outputFormatField() { return DropdownButtonFormField( key: runPipelineOutputFormatKey, initialValue: outputFormat, @@ -257,75 +142,34 @@ class RunPipelineFields extends StatelessWidget { ); } - Future _chooseOutputFormat(BuildContext context) async { - final chosen = await showCupertinoModalPopup( - context: context, - builder: (sheetContext) => CupertinoActionSheet( - title: const Text(runPipelineOutputFormatLabel), - actions: [ - for (final format in RunOutputFormat.values) - CupertinoActionSheetAction( - onPressed: () => Navigator.of(sheetContext).pop(format), - child: Text(format.label), - ), - ], - cancelButton: CupertinoActionSheetAction( - isDefaultAction: true, - onPressed: () => Navigator.of(sheetContext).pop(), - child: const Text(runPipelineCancelLabel), - ), - ), - ); - if (chosen != null) onOutputFormatChanged(chosen); - } - - TextStyle _cupertinoPlaceholder(BuildContext context) { - // The host's own dynamic placeholder colour (light and dark), resolved for - // the dialog's inherited Cupertino brightness. - return TextStyle( - color: CupertinoColors.placeholderText.resolveFrom(context), - ); - } - - Widget _helper(BuildContext context, String text, bool cupertino) { + Widget _helper(BuildContext context, String text) { return Padding( padding: const EdgeInsets.only(top: 4), - child: Text(text, style: _secondaryStyle(context, cupertino)), + child: Text(text, style: _secondaryStyle(context)), ); } } -/// Secondary copy under a field: the host's own secondary role, never a -/// borrowed palette or invented point size. -TextStyle _secondaryStyle(BuildContext context, bool cupertino) { - if (cupertino) { - return CupertinoTheme.of(context).textTheme.tabLabelTextStyle.copyWith( - color: CupertinoColors.secondaryLabel.resolveFrom(context), - ); - } +/// Secondary copy under a field: the theme's secondary role, never a borrowed +/// palette or invented point size. +TextStyle? _secondaryStyle(BuildContext context) { final theme = Theme.of(context); return (theme.textTheme.bodySmall ?? const TextStyle()).copyWith( color: theme.colorScheme.onSurfaceVariant, ); } -/// The label above each native field, using the web's exact words. +/// The label above each field, using the web's exact words. class _FieldLabel extends StatelessWidget { - const _FieldLabel(this.text, {required this.cupertino}); + const _FieldLabel(this.text); final String text; - final bool cupertino; @override Widget build(BuildContext context) { - // A theme label role with the primary label colour, matching the app's - // Cupertino form pattern; secondaryLabel is for helper copy only. - final style = cupertino - ? CupertinoTheme.of(context).textTheme.textStyle - : Theme.of(context).textTheme.labelLarge; return Padding( padding: const EdgeInsets.only(bottom: 4), - child: Text(text, style: style), + child: Text(text, style: Theme.of(context).textTheme.labelLarge), ); } } diff --git a/app/lib/features/pipelines/widgets/pipeline_archive_action.dart b/app/lib/features/pipelines/widgets/pipeline_archive_action.dart index fc5bb10d..59919ad2 100644 --- a/app/lib/features/pipelines/widgets/pipeline_archive_action.dart +++ b/app/lib/features/pipelines/widgets/pipeline_archive_action.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/adaptive/segmented_bar_overflow.dart'; @@ -28,9 +27,7 @@ Widget pipelineActionsMenu( return SegmentedOverflowAction( overflowEntry: SegmentedOverflowEntry( label: archived ? 'Unarchive pipeline' : 'Archive pipeline…', - icon: useCupertinoControls(context) - ? CupertinoIcons.archivebox - : Icons.archive_outlined, + icon: Icons.archive_outlined, onPressed: () => run(context), ), child: AppOverflowMenu( @@ -104,64 +101,28 @@ class PipelineArchivedNotice extends StatelessWidget { Future _confirmArchive(BuildContext context, String name) async { final title = Text('Archive $name?'); final body = Text(archiveConfirmation(name)); - final confirmed = useCupertinoControls(context) - ? await showCupertinoDialog( - context: context, - builder: (context) => CupertinoAlertDialog( - title: title, - content: body, - actions: [ - CupertinoDialogAction( - onPressed: () => Navigator.pop(context, false), - child: const Text('Cancel'), - ), - CupertinoDialogAction( - key: const Key('pipeline-archive-confirm'), - isDefaultAction: true, - onPressed: () => Navigator.pop(context, true), - child: const Text('Archive'), - ), - ], - ), - ) - : await showDialog( - context: context, - builder: (context) => AlertDialog( - title: title, - content: body, - actions: [ - TextButton( - onPressed: () => Navigator.pop(context, false), - child: const Text('Cancel'), - ), - FilledButton( - key: const Key('pipeline-archive-confirm'), - onPressed: () => Navigator.pop(context, true), - child: const Text('Archive'), - ), - ], - ), - ); + final confirmed = await showDialog( + context: context, + builder: (context) => AlertDialog( + title: title, + content: body, + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, false), + child: const Text('Cancel'), + ), + FilledButton( + key: const Key('pipeline-archive-confirm'), + onPressed: () => Navigator.pop(context, true), + child: const Text('Archive'), + ), + ], + ), + ); return confirmed == true; } Future _showRefusal(BuildContext context, String title, String message) { - if (useCupertinoControls(context)) { - return showCupertinoDialog( - context: context, - builder: (context) => CupertinoAlertDialog( - title: Text(title), - content: Text(message), - actions: [ - CupertinoDialogAction( - isDefaultAction: true, - onPressed: () => Navigator.pop(context), - child: const Text('OK'), - ), - ], - ), - ); - } return showDialog( context: context, builder: (context) => AlertDialog( diff --git a/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart b/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart index 91c78725..9fd34cae 100644 --- a/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart +++ b/app/lib/features/pipelines/widgets/pipeline_bar_buttons.dart @@ -2,11 +2,12 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/adaptive/segmented_bar_overflow.dart'; -import 'pipeline_controls.dart'; /// One icon action in the Pipelines bar's actions pill: a Material -/// [IconButton] with its tooltip, or a Cupertino button named for -/// accessibility. A narrow bar moves it into its More menu. +/// [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, @@ -15,33 +16,23 @@ Widget pipelineBarIconButton( required IconData cupertinoIcon, required VoidCallback? onPressed, }) { - final Widget button; - final cupertino = useCupertinoControls(context); - if (cupertino) { - button = CupertinoButton( - key: key, - padding: EdgeInsets.zero, - onPressed: onPressed, - child: Icon(cupertinoIcon), - ); - } else { - button = IconButton( - key: key, - tooltip: label, - onPressed: onPressed, - icon: Icon(icon), - ); - } return SegmentedOverflowAction( overflowEntry: SegmentedOverflowEntry( label: label, - icon: cupertino ? cupertinoIcon : icon, + icon: icon, onPressed: onPressed, ), child: Semantics( button: true, label: label, - child: ExcludeSemantics(child: button), + child: ExcludeSemantics( + child: IconButton( + key: key, + tooltip: label, + onPressed: onPressed, + icon: Icon(icon), + ), + ), ), ); } diff --git a/app/lib/features/pipelines/widgets/pipeline_controls.dart b/app/lib/features/pipelines/widgets/pipeline_controls.dart index 859b4bbc..e62e411a 100644 --- a/app/lib/features/pipelines/widgets/pipeline_controls.dart +++ b/app/lib/features/pipelines/widgets/pipeline_controls.dart @@ -1,17 +1,11 @@ import '../../../ui/adaptive/app_menu_anchor.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../../../ui/adaptive/host.dart'; import '../../../ui/adaptive/segmented_bar.dart'; import '../pipeline_query.dart'; -/// The one control-family decision for this feature: Cupertino only under an -/// explicit Cupertino host, Material on every platform otherwise. -bool useCupertinoControls(BuildContext context) => usesCupertinoHost(context); - -/// Standard platform activity indicator with an accessible status label. +/// Standard Material activity indicator with an accessible status label. class PipelineProgress extends StatelessWidget { const PipelineProgress({super.key, this.label = 'Loading'}); @@ -22,14 +16,12 @@ class PipelineProgress extends StatelessWidget { return Semantics( label: label, liveRegion: true, - child: useCupertinoControls(context) - ? const CupertinoActivityIndicator() - : const CircularProgressIndicator(), + child: const CircularProgressIndicator(), ); } } -/// A standard text action in the current platform's style. +/// A standard Material text action. class PipelineTextButton extends StatelessWidget { const PipelineTextButton({ super.key, @@ -42,18 +34,11 @@ class PipelineTextButton extends StatelessWidget { @override Widget build(BuildContext context) { - if (useCupertinoControls(context)) { - return CupertinoButton( - padding: EdgeInsets.zero, - onPressed: onPressed, - child: Text(label), - ); - } return TextButton(onPressed: onPressed, child: Text(label)); } } -/// Native back affordance used by the narrow list/detail layout. +/// Back affordance used by the narrow list/detail layout. class PipelineBackButton extends StatelessWidget { const PipelineBackButton({super.key, required this.onPressed}); @@ -62,19 +47,18 @@ class PipelineBackButton extends StatelessWidget { /// The same round Back as every page's segmented bar. @override Widget build(BuildContext context) { - final cupertino = useCupertinoControls(context); return Semantics( label: 'Back to pipelines', child: SegmentedPill( - cupertino: cupertino, - child: SegmentedBackButton(cupertino: cupertino, onPressed: onPressed), + cupertino: false, + child: SegmentedBackButton(cupertino: false, onPressed: onPressed), ), ); } } -/// The list's sort control: a Material menu on Android/desktop, an action -/// sheet on iOS. The label is the current choice, exactly as on web. +/// The list's sort control: a Material menu. The label is the current choice, +/// exactly as on web. class PipelineSortButton extends StatelessWidget { const PipelineSortButton({ super.key, @@ -92,23 +76,6 @@ class PipelineSortButton extends StatelessWidget { @override Widget build(BuildContext context) { final label = 'Sort: ${sort.label}'; - if (useCupertinoControls(context)) { - return Semantics( - button: true, - label: icon ? 'Sort pipelines: ${sort.label}' : null, - excludeSemantics: icon, - child: CupertinoButton( - padding: EdgeInsets.zero, - minimumSize: icon - ? const Size.square(kMinInteractiveDimensionCupertino) - : null, - onPressed: () => _showCupertinoSheet(context), - child: icon - ? const Icon(CupertinoIcons.arrow_up_arrow_down) - : Text(label), - ), - ); - } return AppMenuAnchor( menuChildren: [ for (final option in PipelineSort.values) @@ -129,30 +96,6 @@ class PipelineSortButton extends StatelessWidget { ), ); } - - Future _showCupertinoSheet(BuildContext context) { - return showCupertinoModalPopup( - context: context, - builder: (sheetContext) => CupertinoActionSheet( - title: const Text('Sort pipelines'), - actions: [ - for (final option in PipelineSort.values) - CupertinoActionSheetAction( - onPressed: () { - Navigator.of(sheetContext).pop(); - onSelected(option); - }, - child: Text(option.label), - ), - ], - cancelButton: CupertinoActionSheetAction( - isDefaultAction: true, - onPressed: () => Navigator.of(sheetContext).pop(), - child: const Text('Cancel'), - ), - ), - ); - } } /// A truthful, non-blocking error line with an optional retry action. @@ -170,10 +113,7 @@ class PipelineErrorBanner extends StatelessWidget { @override Widget build(BuildContext context) { - final cupertino = useCupertinoControls(context); - final color = cupertino - ? CupertinoColors.systemRed.resolveFrom(context) - : Theme.of(context).colorScheme.error; + final color = Theme.of(context).colorScheme.error; return Semantics( liveRegion: true, child: Padding( diff --git a/app/lib/features/pipelines/widgets/pipeline_definition_validation.dart b/app/lib/features/pipelines/widgets/pipeline_definition_validation.dart index ee395c35..82f5368c 100644 --- a/app/lib/features/pipelines/widgets/pipeline_definition_validation.dart +++ b/app/lib/features/pipelines/widgets/pipeline_definition_validation.dart @@ -1,8 +1,6 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../core/api_gateway.dart'; -import '../../../ui/adaptive/host.dart'; import '../../../ui/layout/warnings_section.dart'; // The gateway bounds this cache to one server connection. Retain at most sixteen @@ -100,15 +98,10 @@ class _PipelineDefinitionValidationState if (snapshot.hasError || !validReply) Align( alignment: AlignmentDirectional.centerStart, - child: usesCupertinoHost(context) - ? CupertinoButton( - onPressed: () => setState(() => _load(retry: true)), - child: const Text('Retry validation'), - ) - : TextButton( - onPressed: () => setState(() => _load(retry: true)), - child: const Text('Retry validation'), - ), + child: TextButton( + onPressed: () => setState(() => _load(retry: true)), + child: const Text('Retry validation'), + ), ), ], ); diff --git a/app/lib/features/pipelines/widgets/pipeline_detail_styles.dart b/app/lib/features/pipelines/widgets/pipeline_detail_styles.dart index 0e55f161..fb1ed9fc 100644 --- a/app/lib/features/pipelines/widgets/pipeline_detail_styles.dart +++ b/app/lib/features/pipelines/widgets/pipeline_detail_styles.dart @@ -1,35 +1,19 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'pipeline_controls.dart'; - TextStyle? pipelineTitleStyle(BuildContext context) => - useCupertinoControls(context) - ? CupertinoTheme.of(context).textTheme.navLargeTitleTextStyle - : Theme.of(context).textTheme.headlineSmall; + Theme.of(context).textTheme.headlineSmall; TextStyle? pipelineSectionStyle(BuildContext context) => - useCupertinoControls(context) - ? CupertinoTheme.of(context).textTheme.navTitleTextStyle - : Theme.of(context).textTheme.titleMedium; + Theme.of(context).textTheme.titleMedium; TextStyle? pipelineValueStyle(BuildContext context, {bool monospace = false}) { - final base = useCupertinoControls(context) - // SelectableText requires an explicit baseline when it inherits no style; - // merge the Cupertino system style with the ambient text style. - ? CupertinoTheme.of(context).textTheme.textStyle.copyWith(inherit: true) - : Theme.of(context).textTheme.bodyMedium; + final base = Theme.of(context).textTheme.bodyMedium; // Metadata can identify code-like values, but the user requested native // typography even for source/hash surfaces; do not replace the host font. return base; } TextStyle? pipelineMutedStyle(BuildContext context) { - if (useCupertinoControls(context)) { - return CupertinoTheme.of(context).textTheme.tabLabelTextStyle.copyWith( - color: CupertinoColors.secondaryLabel.resolveFrom(context), - ); - } final theme = Theme.of(context); return theme.textTheme.bodySmall?.copyWith( color: theme.colorScheme.onSurfaceVariant, diff --git a/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart b/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart index 9fdcdb50..56b649b8 100644 --- a/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart +++ b/app/lib/features/pipelines/widgets/pipeline_detail_tab.dart @@ -14,5 +14,7 @@ enum PipelineDetailTab { /// 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/pipelines/widgets/pipeline_filter_cupertino_body.dart b/app/lib/features/pipelines/widgets/pipeline_filter_cupertino_body.dart deleted file mode 100644 index 1523e0a5..00000000 --- a/app/lib/features/pipelines/widgets/pipeline_filter_cupertino_body.dart +++ /dev/null @@ -1,129 +0,0 @@ -import '../../../ui/theme/app_theme.dart'; -import 'package:flutter/cupertino.dart'; - -import '../pipeline_filter.dart'; - -/// Cupertino filter form using native grouped lists and checkboxes. -class PipelineFilterCupertinoBody extends StatelessWidget { - const PipelineFilterCupertinoBody({ - super.key, - required this.filters, - required this.name, - required this.hasUnclassified, - required this.onChanged, - required this.onClear, - }); - - final PipelineFilters filters; - final TextEditingController name; - final bool hasUnclassified; - final ValueChanged onChanged; - final VoidCallback onClear; - - @override - Widget build(BuildContext context) { - return ListView( - children: [ - Padding( - padding: const EdgeInsets.all(16), - child: CupertinoTextField( - controller: name, - placeholder: 'Pipeline name contains', - ), - ), - CupertinoListSection.insetGrouped( - backgroundColor: AppColors.groupedBackground, - header: const Text('RUNS'), - children: [ - for (final presence in RunPresence.values) - _choice( - label: presence.label, - selected: filters.presence == presence, - onTap: () => onChanged(filters.copyWith(presence: presence)), - ), - ], - ), - CupertinoListSection.insetGrouped( - backgroundColor: AppColors.groupedBackground, - header: const Text('LAST RUN STATUS'), - children: [ - for (final status in runStatusFilters) - _check( - label: status, - checked: filters.lastRunStatuses.contains(status), - onChanged: (checked) { - final next = {...filters.lastRunStatuses}; - if (checked) { - next.add(status); - } else { - next.remove(status); - } - onChanged(filters.copyWith(lastRunStatuses: next)); - }, - ), - ], - ), - CupertinoListSection.insetGrouped( - backgroundColor: AppColors.groupedBackground, - header: const Text('SCHEDULING'), - footer: const Text('Configured schedules, including paused.'), - children: [ - for (final schedule in ScheduleFilter.values) - _choice( - label: schedule.label, - selected: filters.schedule == schedule, - onTap: () => onChanged(filters.copyWith(schedule: schedule)), - ), - ], - ), - Padding( - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (hasUnclassified) - const Padding( - padding: EdgeInsets.only(bottom: 12), - child: Text( - 'Some records have no scheduling metadata; they stay unclassified.', - ), - ), - CupertinoButton( - padding: EdgeInsets.zero, - onPressed: onClear, - child: const Text('Clear filters'), - ), - ], - ), - ), - ], - ); - } - - Widget _choice({ - required String label, - required bool selected, - required VoidCallback onTap, - }) { - return CupertinoListTile( - title: Text(label), - trailing: CupertinoCheckbox(value: selected, onChanged: (_) => onTap()), - onTap: onTap, - ); - } - - Widget _check({ - required String label, - required bool checked, - required ValueChanged onChanged, - }) { - return CupertinoListTile( - title: Text(label), - trailing: CupertinoCheckbox( - value: checked, - onChanged: (value) => onChanged(value ?? false), - ), - onTap: () => onChanged(!checked), - ); - } -} diff --git a/app/lib/features/pipelines/widgets/pipeline_filter_page.dart b/app/lib/features/pipelines/widgets/pipeline_filter_page.dart index 045f9f05..fa06a8ea 100644 --- a/app/lib/features/pipelines/widgets/pipeline_filter_page.dart +++ b/app/lib/features/pipelines/widgets/pipeline_filter_page.dart @@ -1,40 +1,27 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../ui/adaptive/segmented_bar.dart'; import '../pipeline_filter.dart'; -import 'pipeline_controls.dart'; -import 'pipeline_filter_cupertino_body.dart'; import 'pipeline_filter_material_body.dart'; -/// Opens the platform's native full-screen filter editor. +/// Opens the full-screen filter editor. Future openPipelineFilters( BuildContext context, { required PipelineFilters initial, required bool hasUnclassified, required ValueChanged onApply, }) { - final cupertino = useCupertinoControls(context); - final route = cupertino - ? CupertinoPageRoute( - fullscreenDialog: true, - builder: (_) => PipelineFilterPage( - initial: initial, - hasUnclassified: hasUnclassified, - onApply: onApply, - cupertino: true, - ), - ) - : MaterialPageRoute( - fullscreenDialog: true, - builder: (_) => PipelineFilterPage( - initial: initial, - hasUnclassified: hasUnclassified, - onApply: onApply, - cupertino: false, - ), - ); - return Navigator.of(context).push(route); + return Navigator.of(context).push( + MaterialPageRoute( + fullscreenDialog: true, + builder: (_) => PipelineFilterPage( + initial: initial, + hasUnclassified: hasUnclassified, + onApply: onApply, + cupertino: false, + ), + ), + ); } /// A draft copy of the filters. Changes take effect on Done; leaving the page @@ -51,6 +38,8 @@ class PipelineFilterPage extends StatefulWidget { final PipelineFilters initial; final bool hasUnclassified; final ValueChanged onApply; + + /// Retained for callers; the page is Material on every host. final bool cupertino; @override @@ -83,37 +72,6 @@ class _PipelineFilterPageState extends State { @override Widget build(BuildContext context) { - final body = widget.cupertino - ? PipelineFilterCupertinoBody( - filters: _draft, - name: _name, - hasUnclassified: widget.hasUnclassified, - onChanged: (filters) => setState(() => _draft = filters), - onClear: _clear, - ) - : PipelineFilterMaterialBody( - filters: _draft, - name: _name, - hasUnclassified: widget.hasUnclassified, - onChanged: (filters) => setState(() => _draft = filters), - onClear: _clear, - ); - if (widget.cupertino) { - return CupertinoPageScaffold( - navigationBar: SegmentedBar( - cupertino: true, - title: 'Filter pipelines', - actions: [ - CupertinoButton( - padding: const EdgeInsets.symmetric(horizontal: 16), - onPressed: _apply, - child: const Text('Done'), - ), - ], - ), - child: SafeArea(top: false, bottom: false, child: body), - ); - } return Scaffold( extendBodyBehindAppBar: true, appBar: SegmentedBar( @@ -121,7 +79,17 @@ class _PipelineFilterPageState extends State { title: 'Filter pipelines', actions: [TextButton(onPressed: _apply, child: const Text('Done'))], ), - body: SafeArea(top: false, bottom: false, child: body), + body: SafeArea( + top: false, + bottom: false, + child: PipelineFilterMaterialBody( + filters: _draft, + name: _name, + hasUnclassified: widget.hasUnclassified, + onChanged: (filters) => setState(() => _draft = filters), + onClear: _clear, + ), + ), ); } } diff --git a/app/lib/features/pipelines/widgets/pipeline_graph_tab.dart b/app/lib/features/pipelines/widgets/pipeline_graph_tab.dart index 2af76f1e..03ed4046 100644 --- a/app/lib/features/pipelines/widgets/pipeline_graph_tab.dart +++ b/app/lib/features/pipelines/widgets/pipeline_graph_tab.dart @@ -1,11 +1,9 @@ import 'dart:math' as math; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../graph/widgets/definition_graph_view.dart'; import '../pipeline_models.dart'; -import 'pipeline_controls.dart'; import 'pipeline_detail_styles.dart'; /// The Graph tab's guidance note. Gestures stay the host's own: wheel or pinch @@ -207,14 +205,6 @@ class _GraphGuidanceNoteState extends State<_GraphGuidanceNote> { /// The host's own scrollbar: visible whenever the note is clipped, and /// draggable with the pointer, so the rest is discoverable without a wheel. Widget _scrollbar(Widget child) { - if (useCupertinoControls(context)) { - return CupertinoScrollbar( - key: const Key('pipeline-graph-note-scrollbar'), - controller: _scrollController, - thumbVisibility: true, - child: child, - ); - } return Scrollbar( key: const Key('pipeline-graph-note-scrollbar'), controller: _scrollController, diff --git a/app/lib/features/pipelines/widgets/pipeline_list_panel.dart b/app/lib/features/pipelines/widgets/pipeline_list_panel.dart index 27045e0b..f3b63954 100644 --- a/app/lib/features/pipelines/widgets/pipeline_list_panel.dart +++ b/app/lib/features/pipelines/widgets/pipeline_list_panel.dart @@ -1,7 +1,6 @@ import '../../../core/servers/server_context.dart'; import '../../../ui/layout/app_list_avatar.dart'; import '../../../ui/layout/app_list_row.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../shell/shell_list_shortcuts.dart'; @@ -213,7 +212,6 @@ class PipelineListPanel extends StatelessWidget { List items, ) { final now = DateTime.now(); - final cupertino = useCupertinoControls(context); // The default padding is the media padding: the controls start below the // top bar and the last row clears the floating tab bar. return ListView.builder( @@ -228,12 +226,12 @@ class PipelineListPanel extends StatelessWidget { final badge = run == null ? null : runBadge(run, now); return AppListRow( key: Key('pipeline-row-${pipeline.id}'), - cupertino: cupertino, + cupertino: false, selected: controller.selectedId == pipeline.id, divider: index < header.length + items.length - 1, onTap: () => controller.openPipeline(pipeline.id, version: pipeline.version), - leading: _pipelineIdentityIcon(context, pipeline, cupertino), + leading: _pipelineIdentityIcon(context, pipeline), title: Text(pipeline.displayName), time: badge?.ranAgo, subtitleLeading: badge == null @@ -274,11 +272,6 @@ class PipelineListPanel extends StatelessWidget { } TextStyle? _mutedStyle(BuildContext context) { - if (useCupertinoControls(context)) { - return CupertinoTheme.of(context).textTheme.tabLabelTextStyle.copyWith( - color: CupertinoColors.secondaryLabel.resolveFrom(context), - ); - } final theme = Theme.of(context); return theme.textTheme.bodySmall?.copyWith( color: theme.colorScheme.onSurfaceVariant, @@ -290,19 +283,9 @@ class PipelineListPanel extends StatelessWidget { Widget _pipelineIdentityIcon( BuildContext context, PipelineSummary pipeline, - bool cupertino, ) { - final List colors; - if (cupertino) { - colors = [ - CupertinoTheme.of(context).primaryColor, - CupertinoColors.systemIndigo.resolveFrom(context), - CupertinoColors.systemTeal.resolveFrom(context), - ]; - } else { - final scheme = Theme.of(context).colorScheme; - colors = [scheme.primary, scheme.secondary, scheme.tertiary]; - } + final scheme = Theme.of(context).colorScheme; + final colors = [scheme.primary, scheme.secondary, scheme.tertiary]; return Semantics( label: 'Pipeline ${pipeline.displayName}', child: ExcludeSemantics( @@ -334,34 +317,17 @@ List pipelineListActions( final label = filters.count == 0 ? 'Filter pipelines' : '${filters.count} active ${filters.count == 1 ? 'filter' : 'filters'}'; - final cupertino = useCupertinoControls(context); - final filterIcon = cupertino - ? (filters.count > 0 - ? CupertinoIcons.line_horizontal_3_decrease_circle_fill - : CupertinoIcons.line_horizontal_3_decrease_circle) - : (filters.count > 0 ? Icons.filter_alt : Icons.filter_alt_outlined); - final filter = cupertino - ? Semantics( - button: true, - label: label, - excludeSemantics: true, - child: CupertinoButton( - key: const Key('pipeline-filter'), - padding: EdgeInsets.zero, - minimumSize: const Size.square(kMinInteractiveDimensionCupertino), - onPressed: openFilters, - child: Icon(filterIcon), - ), - ) - : IconButton( - key: const Key('pipeline-filter'), - tooltip: label, - isSelected: filters.count > 0, - onPressed: openFilters, - icon: Icon(filterIcon), - ); - // A narrow bar moves either into its More menu; sorting is then a - // submenu (Material) or a second action sheet (Cupertino). + final filterIcon = filters.count > 0 + ? Icons.filter_alt + : Icons.filter_alt_outlined; + final filter = IconButton( + key: const Key('pipeline-filter'), + tooltip: label, + isSelected: filters.count > 0, + onPressed: openFilters, + icon: Icon(filterIcon), + ); + // A narrow bar moves either into its More menu; sorting is then a submenu. return [ SegmentedOverflowAction( overflowEntry: SegmentedOverflowEntry( @@ -374,7 +340,7 @@ List pipelineListActions( SegmentedOverflowAction( overflowEntry: SegmentedOverflowEntry( label: 'Sort pipelines: ${controller.sort.label}', - icon: cupertino ? CupertinoIcons.arrow_up_arrow_down : Icons.sort, + icon: Icons.sort, choices: [ for (final option in PipelineSort.values) SegmentedMenuChoice( diff --git a/app/lib/features/pipelines/widgets/pipeline_scope_control.dart b/app/lib/features/pipelines/widgets/pipeline_scope_control.dart index ae1b5afe..aac7d704 100644 --- a/app/lib/features/pipelines/widgets/pipeline_scope_control.dart +++ b/app/lib/features/pipelines/widgets/pipeline_scope_control.dart @@ -1,8 +1,5 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'pipeline_controls.dart'; - /// The list's scope: every active pipeline, only scheduled ones, or the /// archived pipelines (which the other two never show). enum PipelineScope { @@ -15,7 +12,7 @@ enum PipelineScope { final String label; } -/// Uses a native picker when the segmented labels cannot fit at the user's +/// Uses a standard dropdown when the segmented labels cannot fit at the user's /// text scale. The decision is content-measured, not a fixed pane width. class PipelineScopeControl extends StatelessWidget { const PipelineScopeControl({ @@ -32,10 +29,7 @@ class PipelineScopeControl extends StatelessWidget { @override Widget build(BuildContext context) { - final cupertino = useCupertinoControls(context); - final style = cupertino - ? CupertinoTheme.of(context).textTheme.textStyle - : Theme.of(context).textTheme.labelLarge; + final style = Theme.of(context).textTheme.labelLarge; var requiredWidth = kMinInteractiveDimension * labels.length; for (final label in labels.values) { final painter = TextPainter( @@ -49,84 +43,35 @@ class PipelineScopeControl extends StatelessWidget { return LayoutBuilder( builder: (context, constraints) { if (constraints.maxWidth >= requiredWidth) { - return cupertino - ? CupertinoSlidingSegmentedControl( - key: const Key('pipeline-scope'), - groupValue: scope, - onValueChanged: (value) => - onSelected(value ?? PipelineScope.all), - children: { - for (final entry in labels.entries) - entry.key: Text(entry.value), - }, - ) - : SegmentedButton( - key: const Key('pipeline-scope'), - showSelectedIcon: false, - segments: [ - for (final entry in labels.entries) - ButtonSegment(value: entry.key, label: Text(entry.value)), - ], - selected: {scope}, - onSelectionChanged: (value) => onSelected(value.single), - ); - } - if (!cupertino) { - return DropdownButton( + return SegmentedButton( key: const Key('pipeline-scope'), - value: scope, - isExpanded: true, - items: [ + showSelectedIcon: false, + segments: [ for (final entry in labels.entries) - DropdownMenuItem( - value: entry.key, - child: Text( - entry.value, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ), + ButtonSegment(value: entry.key, label: Text(entry.value)), ], - onChanged: (value) { - if (value != null) onSelected(value); - }, + selected: {scope}, + onSelectionChanged: (value) => onSelected(value.single), ); } - return CupertinoButton( + return DropdownButton( key: const Key('pipeline-scope'), - padding: EdgeInsets.zero, - onPressed: () => showCupertinoModalPopup( - context: context, - builder: (sheetContext) => CupertinoActionSheet( - title: const Text('Pipeline scope'), - actions: [ - for (final entry in labels.entries) - CupertinoActionSheetAction( - onPressed: () { - Navigator.of(sheetContext).pop(); - if (context.mounted) onSelected(entry.key); - }, - child: Text(entry.value), - ), - ], - cancelButton: CupertinoActionSheetAction( - onPressed: () => Navigator.of(sheetContext).pop(), - child: const Text('Cancel'), - ), - ), - ), - child: Row( - children: [ - Expanded( + value: scope, + isExpanded: true, + items: [ + for (final entry in labels.entries) + DropdownMenuItem( + value: entry.key, child: Text( - labels[scope]!, + entry.value, maxLines: 1, overflow: TextOverflow.ellipsis, ), ), - const Icon(CupertinoIcons.chevron_down), - ], - ), + ], + onChanged: (value) { + if (value != null) onSelected(value); + }, ); }, ); diff --git a/app/lib/features/pipelines/widgets/pipeline_summary_view.dart b/app/lib/features/pipelines/widgets/pipeline_summary_view.dart index a86d69ad..96977693 100644 --- a/app/lib/features/pipelines/widgets/pipeline_summary_view.dart +++ b/app/lib/features/pipelines/widgets/pipeline_summary_view.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../../core/api_gateway.dart'; @@ -10,7 +9,6 @@ import '../pipeline_format.dart'; import '../pipeline_models.dart'; import '../pipeline_query.dart'; import '../pipelines_controller.dart'; -import 'pipeline_controls.dart'; import 'pipeline_definition_validation.dart'; import 'pipeline_detail_styles.dart'; @@ -85,7 +83,7 @@ class PipelineSummaryView extends StatelessWidget { if (fields.isEmpty) return const SizedBox.shrink(); return FactsGrid( key: pipelineSummaryFactsKey, - cupertino: useCupertinoControls(context), + cupertino: false, items: [ for (final field in fields) FactsGridItem( @@ -101,7 +99,6 @@ class PipelineSummaryView extends StatelessWidget { } Widget _versions(BuildContext context) { - final cupertino = useCupertinoControls(context); final effective = detail.resolvedVersion; final showingLatest = effective == detail.latestVersion; final versions = detail.versions; @@ -109,7 +106,7 @@ class PipelineSummaryView extends StatelessWidget { if (!showingLatest) AppListRow( key: const Key('pipeline-latest-version'), - cupertino: cupertino, + cupertino: false, title: Text('View latest v${detail.latestVersion}'), subtitle: const Text('Return to the latest version'), divider: versions.isNotEmpty, @@ -118,7 +115,7 @@ class PipelineSummaryView extends StatelessWidget { for (var index = 0; index < versions.length; index += 1) AppListRow( key: Key('pipeline-version-${versions[index].version}'), - cupertino: cupertino, + cupertino: false, selected: versions[index].version == effective, title: Text('v${versions[index].version}'), time: formatLocalTimestamp(versions[index].createdAt), diff --git a/app/lib/features/pipelines/widgets/pipeline_tabs.dart b/app/lib/features/pipelines/widgets/pipeline_tabs.dart index 13ad4f5c..e66eb210 100644 --- a/app/lib/features/pipelines/widgets/pipeline_tabs.dart +++ b/app/lib/features/pipelines/widgets/pipeline_tabs.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import '../../../ui/adaptive/floating_bar_layout.dart'; import '../../../ui/adaptive/floating_destination_bar.dart'; -import 'pipeline_controls.dart'; import 'pipeline_detail_tab.dart'; export 'pipeline_detail_tab.dart'; @@ -30,12 +29,11 @@ class PipelineDetailTabs extends StatelessWidget { @override Widget build(BuildContext context) { - final cupertino = useCupertinoControls(context); const tabs = PipelineDetailTab.values; return KeyedSubtree( key: const Key('pipeline-detail-tabs'), child: FloatingDestinationBar( - cupertino: cupertino, + cupertino: false, currentIndex: tabs.indexOf(selected), edge: edge, onTap: (value) => onSelected(tabs[value]), @@ -43,7 +41,7 @@ class PipelineDetailTabs extends StatelessWidget { for (final tab in tabs) FloatingDestinationItem( key: ValueKey('pipeline-detail-tab-${tab.name}'), - icon: Icon(cupertino ? tab.cupertinoIcon : tab.icon), + icon: Icon(tab.icon), label: tab.label, ), ], diff --git a/app/test/application/pipelines_registration_test.dart b/app/test/application/pipelines_registration_test.dart index 291c8c17..0d181a08 100644 --- a/app/test/application/pipelines_registration_test.dart +++ b/app/test/application/pipelines_registration_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/application/pipelines_app.dart'; @@ -12,83 +11,66 @@ import 'pipelines_replies.dart'; import 'package:pipelines_app/ui/adaptive/segmented_bar.dart'; void main() { - for (final cupertino in [false, true]) { - testWidgets( - 'the /pipelines route renders real rows, detail and source ($cupertino)', - (tester) async { - tester.view.physicalSize = const Size(1100, 900); - tester.view.devicePixelRatio = 1; - addTearDown(tester.view.resetPhysicalSize); - addTearDown(tester.view.resetDevicePixelRatio); - if (cupertino) { - tester.platformDispatcher.platformBrightnessTestValue = - Brightness.dark; - addTearDown( - tester.platformDispatcher.clearPlatformBrightnessTestValue, - ); - } + testWidgets('the /pipelines route renders real rows, detail and source', ( + tester, + ) async { + tester.view.physicalSize = const Size(1100, 900); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); - final fixture = PipelineFixture(); - final channel = FakeChannel()..readyCompleter.complete(); - var sockets = 0; - final client = PipelinesClient( - channelFactory: (_) { - sockets++; - return channel; - }, - ); - final provider = PlatformRouteInformationProvider( - initialRouteInformation: RouteInformation( - uri: Uri.parse('/pipelines'), - ), - ); - addTearDown(provider.dispose); - - await tester.pumpWidget( - PipelinesApp( - server: webServer(), - client: client, - cupertino: cupertino, - routeInformationProvider: provider, - ), - ); - await tester.pump(); - await replyPipelines(tester, channel, fixture); - await tester.pump(); - - expect(find.text('Alpha review'), findsOneWidget); - expect(find.text('2 stages · 1 schedule'), findsOneWidget); - expect(find.text('Pipelines — Not implemented'), findsNothing); - expect(sockets, 1); - - // The shell owns the only navigation bar; the embedded screen adds no - // second bar. - expect(find.byType(SegmentedBar), findsOneWidget); - if (cupertino) { - expect(find.byType(CupertinoPageScaffold), findsOneWidget); - expect(find.byType(Material), findsNothing); - } else { - expect(find.byType(Scaffold), findsOneWidget); - } - - await tester.tap(find.byKey(const Key('pipeline-row-1'))); - await tester.pump(); - await replyPipelineDetail(tester, channel, fixture); - await tester.pump(); - expect(find.text('hash-alpha'), findsOneWidget); - - await tester.tap(find.byKey(const Key('pipeline-detail-tab-source'))); - await tester.pump(); - expect( - selectableText( - 'name: Alpha review\nstages:\n review:\n type: model', - ), - findsOneWidget, - ); - - await tester.pumpWidget(const SizedBox.shrink()); - await tester.pump(); + final fixture = PipelineFixture(); + final channel = FakeChannel()..readyCompleter.complete(); + var sockets = 0; + final client = PipelinesClient( + channelFactory: (_) { + sockets++; + return channel; }, ); - } + final provider = PlatformRouteInformationProvider( + initialRouteInformation: RouteInformation(uri: Uri.parse('/pipelines')), + ); + addTearDown(provider.dispose); + + await tester.pumpWidget( + PipelinesApp( + server: webServer(), + client: client, + cupertino: false, + routeInformationProvider: provider, + ), + ); + await tester.pump(); + await replyPipelines(tester, channel, fixture); + await tester.pump(); + + expect(find.text('Alpha review'), findsOneWidget); + expect(find.text('2 stages · 1 schedule'), findsOneWidget); + expect(find.text('Pipelines — Not implemented'), findsNothing); + expect(sockets, 1); + + // The shell owns the only navigation bar; the embedded screen adds no + // second bar. + expect(find.byType(SegmentedBar), findsOneWidget); + expect(find.byType(Scaffold), findsOneWidget); + + await tester.tap(find.byKey(const Key('pipeline-row-1'))); + await tester.pump(); + await replyPipelineDetail(tester, channel, fixture); + await tester.pump(); + expect(find.text('hash-alpha'), findsOneWidget); + + await tester.tap(find.byKey(const Key('pipeline-detail-tab-source'))); + await tester.pump(); + expect( + selectableText( + 'name: Alpha review\nstages:\n review:\n type: model', + ), + findsOneWidget, + ); + + await tester.pumpWidget(const SizedBox.shrink()); + await tester.pump(); + }); } diff --git a/app/test/application/settings_page_test.dart b/app/test/application/settings_page_test.dart index 16089843..28edd59f 100644 --- a/app/test/application/settings_page_test.dart +++ b/app/test/application/settings_page_test.dart @@ -1,5 +1,4 @@ import '../features/settings/settings_topic_test_helper.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/application/pipelines_app.dart'; @@ -20,7 +19,6 @@ import 'pipelines_replies.dart'; void main() { Future pumpApp( WidgetTester tester, { - required bool cupertino, required String location, required Size size, }) async { @@ -37,7 +35,7 @@ void main() { PipelinesApp( server: webServer(), client: PipelinesClient(channelFactory: (_) => channel), - cupertino: cupertino, + cupertino: false, routeInformationProvider: provider, ), ); @@ -52,82 +50,77 @@ void main() { .widget(find.byType(FloatingDestinationBar)) .currentIndex; - for (final cupertino in [false, true]) { - final host = cupertino ? 'Cupertino' : 'Material'; - for (final size in [const Size(390, 844), const Size(1200, 800)]) { - testWidgets('$host ${size.width}: the Pipelines bar gear opens Settings ' - 'as a page and Back returns', (tester) async { - final provider = await pumpApp( - tester, - cupertino: cupertino, - location: '/pipelines', - size: size, - ); - // Four tabs; Settings is none of them. - expect( - tester - .widget( - find.byType(FloatingDestinationBar), - ) - .items - .map((item) => item.label), - ['Pipelines', 'Runs', 'Chat', 'Search'], - ); - expect( - find.byKey(const ValueKey('shell.destination.settings')), - findsNothing, - ); - expect(find.byKey(const ValueKey('shell.back')), findsNothing); - - await tapBarAction( - tester, - find.byKey(const Key('pipelines-open-settings')), - 'Settings', - ); - await tester.pump(); - await tester.pump(); - expect(provider.value.uri.path, '/settings'); - expect(find.byType(SettingsScreen), findsOneWidget); - expect(find.text('Quick switch animation'), findsOneWidget); - await selectSettingsTopic(tester, 'Connection'); - expect(find.text('Server URL'), findsOneWidget); - // A page of Pipelines: Back in its bar, Pipelines still selected. - expect(find.byKey(const ValueKey('shell.back')), findsOneWidget); - expect(find.byKey(const ValueKey('shell.search')), findsNothing); - expect(selectedTab(tester), 0); - expect(tester.takeException(), isNull); - - await tester.tap(find.byKey(const ValueKey('shell.back'))); - await tester.pump(); - await tester.pump(); - expect(provider.value.uri.path, '/pipelines'); - expect(find.byKey(const Key('pipelines-open-settings')), findsWidgets); - expect(find.byKey(const ValueKey('shell.back')), findsNothing); - await tester.pumpWidget(const SizedBox.shrink()); - await tester.pump(); - }); - } - - testWidgets('$host: the /settings deep link opens the Settings page and ' - 'the system Back closes it to Pipelines', (tester) async { + for (final size in [const Size(390, 844), const Size(1200, 800)]) { + testWidgets('${size.width}: the Pipelines bar gear opens Settings ' + 'as a page and Back returns', (tester) async { final provider = await pumpApp( tester, - cupertino: cupertino, - location: '/settings', - size: const Size(390, 844), + location: '/pipelines', + size: size, + ); + // Four tabs; Settings is none of them. + expect( + tester + .widget( + find.byType(FloatingDestinationBar), + ) + .items + .map((item) => item.label), + ['Pipelines', 'Runs', 'Chat', 'Search'], + ); + expect( + find.byKey(const ValueKey('shell.destination.settings')), + findsNothing, + ); + expect(find.byKey(const ValueKey('shell.back')), findsNothing); + + await tapBarAction( + tester, + find.byKey(const Key('pipelines-open-settings')), + 'Settings', ); await tester.pump(); + await tester.pump(); + expect(provider.value.uri.path, '/settings'); expect(find.byType(SettingsScreen), findsOneWidget); + expect(find.text('Quick switch animation'), findsOneWidget); + await selectSettingsTopic(tester, 'Connection'); + expect(find.text('Server URL'), findsOneWidget); + // A page of Pipelines: Back in its bar, Pipelines still selected. expect(find.byKey(const ValueKey('shell.back')), findsOneWidget); + expect(find.byKey(const ValueKey('shell.search')), findsNothing); expect(selectedTab(tester), 0); + expect(tester.takeException(), isNull); - final handled = await tester.binding.handlePopRoute(); - expect(handled, isTrue, reason: 'Back closes the page, not the app'); + await tester.tap(find.byKey(const ValueKey('shell.back'))); await tester.pump(); await tester.pump(); expect(provider.value.uri.path, '/pipelines'); + expect(find.byKey(const Key('pipelines-open-settings')), findsWidgets); + expect(find.byKey(const ValueKey('shell.back')), findsNothing); await tester.pumpWidget(const SizedBox.shrink()); await tester.pump(); }); } + + testWidgets('the /settings deep link opens the Settings page and ' + 'the system Back closes it to Pipelines', (tester) async { + final provider = await pumpApp( + tester, + location: '/settings', + size: const Size(390, 844), + ); + await tester.pump(); + expect(find.byType(SettingsScreen), findsOneWidget); + expect(find.byKey(const ValueKey('shell.back')), findsOneWidget); + expect(selectedTab(tester), 0); + + final handled = await tester.binding.handlePopRoute(); + expect(handled, isTrue, reason: 'Back closes the page, not the app'); + await tester.pump(); + await tester.pump(); + expect(provider.value.uri.path, '/pipelines'); + await tester.pumpWidget(const SizedBox.shrink()); + await tester.pump(); + }); } diff --git a/app/test/application/settings_registration_test.dart b/app/test/application/settings_registration_test.dart index c79c7b03..ccad068c 100644 --- a/app/test/application/settings_registration_test.dart +++ b/app/test/application/settings_registration_test.dart @@ -1,7 +1,6 @@ import '../features/settings/settings_topic_test_helper.dart'; import 'dart:convert'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/application/pipelines_app.dart'; @@ -16,89 +15,73 @@ import 'pipelines_replies.dart'; import 'package:pipelines_app/ui/adaptive/segmented_bar.dart'; void main() { - for (final cupertino in [false, true]) { - testWidgets('Settings shares socket and one native bar ($cupertino)', ( - tester, - ) async { - SharedPreferences.setMockInitialValues({}); - if (cupertino) { - tester.platformDispatcher.platformBrightnessTestValue = Brightness.dark; - addTearDown(tester.platformDispatcher.clearPlatformBrightnessTestValue); - } - final channel = FakeChannel()..readyCompleter.complete(); - var sockets = 0; - final client = PipelinesClient( - channelFactory: (_) { - sockets++; - return channel; - }, - ); - final provider = PlatformRouteInformationProvider( - initialRouteInformation: RouteInformation(uri: Uri.parse('/pipelines')), - ); - addTearDown(provider.dispose); - await tester.pumpWidget( - PipelinesApp( - server: webServer(), - client: client, - cupertino: cupertino, - routeInformationProvider: provider, - ), - ); - await tester.pump(); - expect( - requestOf(channel, 'ping'), - isNull, - reason: 'Unvisited settings must not issue hidden requests', - ); - await replyPipelines(tester, channel, PipelineFixture()); + testWidgets('Settings shares socket and one native bar', (tester) async { + SharedPreferences.setMockInitialValues({}); + final channel = FakeChannel()..readyCompleter.complete(); + var sockets = 0; + final client = PipelinesClient( + channelFactory: (_) { + sockets++; + return channel; + }, + ); + final provider = PlatformRouteInformationProvider( + initialRouteInformation: RouteInformation(uri: Uri.parse('/pipelines')), + ); + addTearDown(provider.dispose); + await tester.pumpWidget( + PipelinesApp( + server: webServer(), + client: client, + cupertino: false, + routeInformationProvider: provider, + ), + ); + await tester.pump(); + expect( + requestOf(channel, 'ping'), + isNull, + reason: 'Unvisited settings must not issue hidden requests', + ); + await replyPipelines(tester, channel, PipelineFixture()); - await tapBarAction( - tester, - find.byKey(const Key('pipelines-open-settings')), - 'Settings', - ); - await tester.pump(); - await tester.pump(); - expect(provider.value.uri.path, '/settings'); - expect(find.text('Quick switch animation'), findsOneWidget); - await selectSettingsTopic(tester, 'Connection'); - expect(find.text('Server URL'), findsOneWidget); - if (cupertino) { - final title = tester.widget(find.text('Connection').last); - expect( - title.style!.color!.computeLuminance(), - greaterThan(0.5), - reason: 'Cupertino dark host must not inherit light Material text', - ); - } - expect(find.text('Settings — Not implemented'), findsNothing); - expect(sockets, 1); - expect(find.byType(SegmentedBar), findsOneWidget); - final ping = requestOf(channel, 'ping')!; - channel.incoming.add( - jsonEncode({ - 'id': ping['id'], - 'type': 'pong', - 'build': {'version': 'settings-fixture'}, - 'time': 'fixture time', - 'protocol': 2, - }), - ); - await tester.pump(); - await tester.pump(); - expect(find.textContaining('settings-fixture'), findsOneWidget); - expect( - find.text( - 'Protocol mismatch: this page speaks protocol 1, ' - 'the server reports 2.', - ), - findsOneWidget, - reason: 'a mismatched server must stay visibly flagged in Settings', - ); - expect(tester.takeException(), isNull); - await tester.pumpWidget(const SizedBox.shrink()); - await tester.pump(); - }); - } + await tapBarAction( + tester, + find.byKey(const Key('pipelines-open-settings')), + 'Settings', + ); + await tester.pump(); + await tester.pump(); + expect(provider.value.uri.path, '/settings'); + expect(find.text('Quick switch animation'), findsOneWidget); + await selectSettingsTopic(tester, 'Connection'); + expect(find.text('Server URL'), findsOneWidget); + expect(find.text('Settings — Not implemented'), findsNothing); + expect(sockets, 1); + expect(find.byType(SegmentedBar), findsOneWidget); + final ping = requestOf(channel, 'ping')!; + channel.incoming.add( + jsonEncode({ + 'id': ping['id'], + 'type': 'pong', + 'build': {'version': 'settings-fixture'}, + 'time': 'fixture time', + 'protocol': 2, + }), + ); + await tester.pump(); + await tester.pump(); + expect(find.textContaining('settings-fixture'), findsOneWidget); + expect( + find.text( + 'Protocol mismatch: this page speaks protocol 1, ' + 'the server reports 2.', + ), + findsOneWidget, + reason: 'a mismatched server must stay visibly flagged in Settings', + ); + expect(tester.takeException(), isNull); + await tester.pumpWidget(const SizedBox.shrink()); + await tester.pump(); + }); } diff --git a/app/test/application/tab_location_navigation_test.dart b/app/test/application/tab_location_navigation_test.dart index 6da663d8..cae8dfb3 100644 --- a/app/test/application/tab_location_navigation_test.dart +++ b/app/test/application/tab_location_navigation_test.dart @@ -22,7 +22,6 @@ Future<({PlatformRouteInformationProvider provider, FakeChannel channel})> mount( WidgetTester tester, { String route = '/pipelines', - bool cupertino = false, TabLocationsStore? store, }) async { tester.view.physicalSize = const Size(560, 1000); @@ -39,7 +38,7 @@ mount( PipelinesApp( server: webServer(), client: client, - cupertino: cupertino, + cupertino: false, serverId: 'navigation-test', routeInformationProvider: provider, tabLocationsStore: store, @@ -58,44 +57,41 @@ Future tab(WidgetTester tester, String name) async { void main() { setUp(() => SharedPreferences.setMockInitialValues({})); - for (final cupertino in [false, true]) { - testWidgets( - 'Settings is retained inside Pipelines across tab switches ($cupertino)', - (tester) async { - final app = await mount(tester, cupertino: cupertino); - await replyPipelines(tester, app.channel, PipelineFixture()); - await tester.pumpAndSettle(); - await tapBarAction( - tester, - find.byKey(const Key('pipelines-open-settings')), - 'Settings', - ); - await tester.pumpAndSettle(); - expect(app.provider.value.uri.path, '/settings'); - final settingsState = tester.state(find.byType(SettingsScreen)); - await tab(tester, 'chat'); - expect(app.provider.value.uri.path, '/chat'); - await tab(tester, 'pipelines'); - expect(app.provider.value.uri.path, '/settings'); - expect(tester.state(find.byType(SettingsScreen)), same(settingsState)); - await tab(tester, 'pipelines'); - expect( - app.provider.value.uri.path, - '/settings', - reason: 'tab retap is not Back', - ); - await tester.tap(find.byKey(const ValueKey('shell.back'))); - await tester.pump(); - await tester.pump(const Duration(milliseconds: 500)); - expect( - app.provider.value.uri.path, - '/pipelines', - reason: 'explicit Back still exits Settings', - ); - expect(tester.takeException(), isNull); - }, + testWidgets('Settings is retained inside Pipelines across tab switches', ( + tester, + ) async { + final app = await mount(tester); + await replyPipelines(tester, app.channel, PipelineFixture()); + await tester.pumpAndSettle(); + await tapBarAction( + tester, + find.byKey(const Key('pipelines-open-settings')), + 'Settings', ); - } + await tester.pumpAndSettle(); + expect(app.provider.value.uri.path, '/settings'); + final settingsState = tester.state(find.byType(SettingsScreen)); + await tab(tester, 'chat'); + expect(app.provider.value.uri.path, '/chat'); + await tab(tester, 'pipelines'); + expect(app.provider.value.uri.path, '/settings'); + expect(tester.state(find.byType(SettingsScreen)), same(settingsState)); + await tab(tester, 'pipelines'); + expect( + app.provider.value.uri.path, + '/settings', + reason: 'tab retap is not Back', + ); + await tester.tap(find.byKey(const ValueKey('shell.back'))); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 500)); + expect( + app.provider.value.uri.path, + '/pipelines', + reason: 'explicit Back still exits Settings', + ); + expect(tester.takeException(), isNull); + }); testWidgets( 'per-tab locations survive app recreation; an explicit deep link wins', (tester) async { @@ -209,24 +205,19 @@ void main() { ); expect(tester.takeException(), isNull); }); - for (final cupertino in [false, true]) { - testWidgets('ordinary root with query restores its tab ($cupertino)', ( - tester, - ) async { - final store = MemoryTabLocationsStore() - ..value = const TabLocationsSnapshot( - routes: {AppDestination.pipelines: AppRoute.settings}, - ); - final app = await mount( - tester, - route: '/?appearance=cupertino', - cupertino: cupertino, - store: store, + testWidgets('ordinary root with query restores its tab', (tester) async { + final store = MemoryTabLocationsStore() + ..value = const TabLocationsSnapshot( + routes: {AppDestination.pipelines: AppRoute.settings}, ); - await tester.pumpAndSettle(); - expect(app.provider.value.uri.path, '/settings'); - expect(find.byType(SettingsScreen), findsOneWidget); - expect(tester.takeException(), isNull); - }); - } + final app = await mount( + tester, + route: '/?appearance=cupertino', + store: store, + ); + await tester.pumpAndSettle(); + expect(app.provider.value.uri.path, '/settings'); + expect(find.byType(SettingsScreen), findsOneWidget); + expect(tester.takeException(), isNull); + }); } diff --git a/app/test/features/pipelines/pipeline_archive_test.dart b/app/test/features/pipelines/pipeline_archive_test.dart index 489f78b2..992c39fc 100644 --- a/app/test/features/pipelines/pipeline_archive_test.dart +++ b/app/test/features/pipelines/pipeline_archive_test.dart @@ -1,5 +1,3 @@ -import 'package:flutter/foundation.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/pipelines/screen.dart'; @@ -52,19 +50,13 @@ FakeGateway archiveGateway(PipelineFixture fixture, {String? refusal}) { }); } -Future pump( - WidgetTester tester, - FakeGateway gateway, { - bool cupertino = false, -}) async { +Future pump(WidgetTester tester, FakeGateway gateway) async { tester.view.physicalSize = const Size(1100, 900); tester.view.devicePixelRatio = 1; addTearDown(tester.view.resetPhysicalSize); addTearDown(tester.view.resetDevicePixelRatio); final screen = PipelinesScreen(gateway: gateway); - await tester.pumpWidget( - cupertino ? CupertinoApp(home: screen) : MaterialApp(home: screen), - ); + await tester.pumpWidget(MaterialApp(home: screen)); await tester.pumpAndSettle(); } @@ -161,24 +153,4 @@ void main() { await tester.pumpAndSettle(); expect(rowNamed('Alpha review'), findsOneWidget); }); - - testWidgets('Cupertino archives through the action sheet and alert', ( - tester, - ) async { - debugDefaultTargetPlatformOverride = TargetPlatform.iOS; - try { - final gateway = archiveGateway(PipelineFixture()); - await pump(tester, gateway, cupertino: true); - await tester.tap(rowNamed('Beta deploy')); - await tester.pumpAndSettle(); - await openMenuItem(tester, 'pipeline-archive'); - expect(find.byType(CupertinoAlertDialog), findsOneWidget); - await tester.tap(find.byKey(const Key('pipeline-archive-confirm'))); - await tester.pumpAndSettle(); - expect(gateway.callsOf('archive_pipeline'), hasLength(1)); - expect(rowNamed('Beta deploy'), findsNothing); - } finally { - debugDefaultTargetPlatformOverride = null; - } - }); } diff --git a/app/test/features/pipelines/pipeline_definition_warnings_test.dart b/app/test/features/pipelines/pipeline_definition_warnings_test.dart index 63c31c14..50135775 100644 --- a/app/test/features/pipelines/pipeline_definition_warnings_test.dart +++ b/app/test/features/pipelines/pipeline_definition_warnings_test.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/core/api_gateway.dart'; @@ -21,44 +20,31 @@ class _Gateway implements ApiGateway { Stream get frames => const Stream.empty(); } -Widget _host( - _Gateway gateway, { - bool cupertino = false, - String source = '# stage build', -}) { +Widget _host(_Gateway gateway, {String source = '# stage build'}) { final body = Column( children: [ const Text('Pipeline source remains available'), PipelineDefinitionValidation(gateway: gateway, source: source), ], ); - return cupertino - ? CupertinoApp( - home: CupertinoPageScaffold(child: SafeArea(child: body)), - ) - : MaterialApp(home: Scaffold(body: body)); + return MaterialApp(home: Scaffold(body: body)); } void main() { - for (final cupertino in [false, true]) { - testWidgets( - 'definition warnings stay visible on ${cupertino ? 'Cupertino' : 'Material'}', - (tester) async { - final gateway = _Gateway() - ..answer = () async => { - 'type': 'validated', - 'warnings': ['Review prompt exceeds 2000 bytes.', '', 42], - }; - await tester.pumpWidget(_host(gateway, cupertino: cupertino)); - await tester.pumpAndSettle(); - expect(find.text('Definition warnings'), findsOneWidget); - expect(find.text('Review prompt exceeds 2000 bytes.'), findsOneWidget); - expect(find.text('42'), findsNothing); - expect(gateway.calls.single, {'source': '# stage build'}); - expect(tester.takeException(), isNull); - }, - ); - } + testWidgets('definition warnings stay visible', (tester) async { + final gateway = _Gateway() + ..answer = () async => { + 'type': 'validated', + 'warnings': ['Review prompt exceeds 2000 bytes.', '', 42], + }; + await tester.pumpWidget(_host(gateway)); + await tester.pumpAndSettle(); + expect(find.text('Definition warnings'), findsOneWidget); + expect(find.text('Review prompt exceeds 2000 bytes.'), findsOneWidget); + expect(find.text('42'), findsNothing); + expect(gateway.calls.single, {'source': '# stage build'}); + expect(tester.takeException(), isNull); + }); testWidgets( 'loading validation never hides detail and a source is checked once', diff --git a/app/test/features/pipelines/pipeline_list_composition_test.dart b/app/test/features/pipelines/pipeline_list_composition_test.dart index 858b6b1b..c35ae3f9 100644 --- a/app/test/features/pipelines/pipeline_list_composition_test.dart +++ b/app/test/features/pipelines/pipeline_list_composition_test.dart @@ -1,7 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/ui/layout/app_list_row.dart'; @@ -211,34 +209,4 @@ void main() { ); expect(tester.takeException(), isNull); }); - - testWidgets('Cupertino keeps the shared row with the same row identity', ( - tester, - ) async { - debugDefaultTargetPlatformOverride = TargetPlatform.iOS; - tester.view.physicalSize = const Size(1100, 900); - tester.view.devicePixelRatio = 1; - addTearDown(tester.view.reset); - try { - await tester.pumpWidget( - CupertinoApp( - home: PipelinesScreen(gateway: gatewayFor(PipelineFixture())), - ), - ); - await tester.pumpAndSettle(); - - expect( - tester - .widget(find.byKey(const Key('pipeline-row-1'))) - .cupertino, - isTrue, - ); - expect(find.text('2 stages · 1 schedule'), findsOneWidget); - expect(find.textContaining('v2 · #'), findsNothing); - expect(find.byKey(const Key('pipeline-avatar-1')), findsOneWidget); - expect(find.byKey(const Key('pipeline-status-1')), findsOneWidget); - } finally { - debugDefaultTargetPlatformOverride = null; - } - }); } diff --git a/app/test/features/pipelines/pipeline_scope_control_test.dart b/app/test/features/pipelines/pipeline_scope_control_test.dart index bd4db29b..475363d0 100644 --- a/app/test/features/pipelines/pipeline_scope_control_test.dart +++ b/app/test/features/pipelines/pipeline_scope_control_test.dart @@ -1,45 +1,35 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/pipelines/widgets/pipeline_scope_control.dart'; void main() { - for (final cupertino in [false, true]) { - for (final width in [120.0, 500.0]) { - testWidgets( - 'native scope remains usable at $width, Cupertino=$cupertino', - (tester) async { - var scope = PipelineScope.all; - final control = StatefulBuilder( - builder: (context, setState) => Center( - child: SizedBox( - width: width, - child: PipelineScopeControl( - scope: scope, - onSelected: (value) => setState(() => scope = value), - ), - ), + for (final width in [120.0, 500.0]) { + testWidgets('native scope remains usable at $width', (tester) async { + var scope = PipelineScope.all; + final control = StatefulBuilder( + builder: (context, setState) => Center( + child: SizedBox( + width: width, + child: PipelineScopeControl( + scope: scope, + onSelected: (value) => setState(() => scope = value), ), - ); - await tester.pumpWidget( - cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: control)) - : MaterialApp(home: Scaffold(body: control)), - ); - await tester.pumpAndSettle(); - if (width == 120) { - await tester.tap(find.byKey(const Key('pipeline-scope'))); - await tester.pumpAndSettle(); - await tester.tap(find.text('Scheduled').last); - } else { - await tester.tap(find.text('Scheduled')); - } - await tester.pumpAndSettle(); - expect(scope, PipelineScope.scheduled); - expect(tester.takeException(), isNull); - }, + ), + ), ); - } + await tester.pumpWidget(MaterialApp(home: Scaffold(body: control))); + await tester.pumpAndSettle(); + if (width == 120) { + await tester.tap(find.byKey(const Key('pipeline-scope'))); + await tester.pumpAndSettle(); + await tester.tap(find.text('Scheduled').last); + } else { + await tester.tap(find.text('Scheduled')); + } + await tester.pumpAndSettle(); + expect(scope, PipelineScope.scheduled); + expect(tester.takeException(), isNull); + }); } testWidgets('wide scope control hugs its labels', (tester) async { diff --git a/app/test/features/pipelines/pipeline_summary_flat_test.dart b/app/test/features/pipelines/pipeline_summary_flat_test.dart index f58a8383..24283204 100644 --- a/app/test/features/pipelines/pipeline_summary_flat_test.dart +++ b/app/test/features/pipelines/pipeline_summary_flat_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/pipelines/screen.dart'; @@ -8,68 +7,62 @@ import 'package:pipelines_app/ui/layout/app_list_row.dart'; import 'fixtures.dart'; -/// The pipeline Summary is flat on both hosts: facts in the shared grid, -/// Schedules with Add as its heading's only action (no body Refresh), and -/// versions as the shared list row. +/// The pipeline Summary is flat: facts in the shared grid, Schedules with Add +/// as its heading's only action (no body Refresh), and versions as the shared +/// list row. void main() { - for (final cupertino in [false, true]) { - testWidgets('pipeline Summary is a facts grid with flat sections ' - '(${cupertino ? 'cupertino' : 'material'})', (tester) async { - final gateway = FakeGateway((type, fields) { - return switch (type) { - 'list_pipelines' => pipelineListReply([ - pipelineSummary(id: 1, name: 'Alpha review', version: 3), - ]), - 'list_runs' => runListReply([]), - 'get_pipeline' => pipelineDetailReply( - pipelineDetail( - id: 1, - name: 'Alpha review', - version: 3, - latestVersion: 3, - versions: [versionSummary(2), versionSummary(3)], - ), + testWidgets('pipeline Summary is a facts grid with flat sections', ( + tester, + ) async { + final gateway = FakeGateway((type, fields) { + return switch (type) { + 'list_pipelines' => pipelineListReply([ + pipelineSummary(id: 1, name: 'Alpha review', version: 3), + ]), + 'list_runs' => runListReply([]), + 'get_pipeline' => pipelineDetailReply( + pipelineDetail( + id: 1, + name: 'Alpha review', + version: 3, + latestVersion: 3, + versions: [versionSummary(2), versionSummary(3)], ), - 'list_schedules' => {'type': 'schedules', 'schedules': []}, - _ => errorReply('unexpected $type'), - }; - }); - tester.view.physicalSize = const Size(1100, 900); - tester.view.devicePixelRatio = 1; - addTearDown(tester.view.resetPhysicalSize); - addTearDown(tester.view.resetDevicePixelRatio); - final screen = PipelinesScreen(gateway: gateway); - await tester.pumpWidget( - cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: screen)) - : MaterialApp(home: screen), - ); - await tester.pumpAndSettle(); - await tester.tap(find.byKey(const Key('pipeline-row-1'))); - await tester.pumpAndSettle(); - - expect(find.byKey(pipelineSummaryFactsKey), findsOneWidget); - // Short facts share a line instead of one label/value row each. - final latest = tester.getRect( - find.byKey(const ValueKey('pipeline-summary-latest-version')), - ); - final versionCreated = tester.getRect( - find.byKey(const ValueKey('pipeline-summary-version-created')), - ); - expect(versionCreated.top, moreOrLessEquals(latest.top)); - expect(versionCreated.left, greaterThan(latest.right)); - - expect(find.text('Refresh'), findsNothing); - expect(find.text(scheduleAddLabel), findsNothing); - expect(find.byKey(scheduleAddKey), findsOneWidget); - expect(find.byType(CupertinoListSection), findsNothing); - expect(find.byType(ListTile), findsNothing); - final row = tester.widget( - find.byKey(const Key('pipeline-version-3')), - ); - expect(row.selected, isTrue); - expect(row.cupertino, cupertino); - expect(tester.takeException(), isNull); + ), + 'list_schedules' => {'type': 'schedules', 'schedules': []}, + _ => errorReply('unexpected $type'), + }; }); - } + tester.view.physicalSize = const Size(1100, 900); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); + final screen = PipelinesScreen(gateway: gateway); + await tester.pumpWidget(MaterialApp(home: screen)); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(const Key('pipeline-row-1'))); + await tester.pumpAndSettle(); + + expect(find.byKey(pipelineSummaryFactsKey), findsOneWidget); + // Short facts share a line instead of one label/value row each. + final latest = tester.getRect( + find.byKey(const ValueKey('pipeline-summary-latest-version')), + ); + final versionCreated = tester.getRect( + find.byKey(const ValueKey('pipeline-summary-version-created')), + ); + expect(versionCreated.top, moreOrLessEquals(latest.top)); + expect(versionCreated.left, greaterThan(latest.right)); + + expect(find.text('Refresh'), findsNothing); + expect(find.text(scheduleAddLabel), findsNothing); + expect(find.byKey(scheduleAddKey), findsOneWidget); + expect(find.byType(ListTile), findsNothing); + final row = tester.widget( + find.byKey(const Key('pipeline-version-3')), + ); + expect(row.selected, isTrue); + expect(row.cupertino, isFalse); + expect(tester.takeException(), isNull); + }); } diff --git a/app/test/features/pipelines/pipeline_tabs_test.dart b/app/test/features/pipelines/pipeline_tabs_test.dart index 8b07a261..bf34be92 100644 --- a/app/test/features/pipelines/pipeline_tabs_test.dart +++ b/app/test/features/pipelines/pipeline_tabs_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/pipelines/widgets/pipeline_tabs.dart'; @@ -26,64 +25,52 @@ void main() { ); }); - for (final cupertino in [false, true]) { - for (final width in [320.0, 390.0, 720.0, 1200.0]) { - testWidgets('floating tabs at $width, 2x, Cupertino=$cupertino', ( - tester, - ) async { - tester.view.physicalSize = Size(width, 640); - tester.view.devicePixelRatio = 1; - addTearDown(tester.view.reset); - PipelineDetailTab? selected; - final body = Align( - alignment: Alignment.bottomCenter, - child: PipelineDetailTabs( - selected: PipelineDetailTab.summary, - onSelected: (value) => selected = value, - ), + for (final width in [320.0, 390.0, 720.0, 1200.0]) { + testWidgets('floating tabs at $width, 2x', (tester) async { + tester.view.physicalSize = Size(width, 640); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.reset); + PipelineDetailTab? selected; + final body = Align( + alignment: Alignment.bottomCenter, + child: PipelineDetailTabs( + selected: PipelineDetailTab.summary, + onSelected: (value) => selected = value, + ), + ); + Widget scaled(BuildContext context, Widget? child) => MediaQuery( + data: MediaQuery.of( + context, + ).copyWith(textScaler: TextScaler.linear(2)), + child: child!, + ); + await tester.pumpWidget( + MaterialApp(builder: scaled, home: Scaffold(body: body)), + ); + await tester.pumpAndSettle(); + // One floating bar of separate round tab buttons. + expect(find.byType(FloatingDestinationBar), findsOneWidget); + final pill = tester.getRect(find.byKey(FloatingDestinationBar.rowKey)); + // Sized to its three tabs at the right edge, on a phone as when wide. + expect(pill.right, width - 16); + expect( + pill.width, + FloatingDestinationBar.rowWidth( + cupertino: false, + tabs: PipelineDetailTab.values.length, + ), + ); + for (final tab in PipelineDetailTab.values) { + final rect = tester.getRect( + find.byKey(ValueKey('pipeline-detail-tab-${tab.name}')), ); - Widget scaled(BuildContext context, Widget? child) => MediaQuery( - data: MediaQuery.of( - context, - ).copyWith(textScaler: TextScaler.linear(2)), - child: child!, - ); - await tester.pumpWidget( - cupertino - ? CupertinoApp( - builder: scaled, - home: CupertinoPageScaffold(child: body), - ) - : MaterialApp( - builder: scaled, - home: Scaffold(body: body), - ), - ); - await tester.pumpAndSettle(); - // One floating bar of separate round tab buttons. - expect(find.byType(FloatingDestinationBar), findsOneWidget); - final pill = tester.getRect(find.byKey(FloatingDestinationBar.rowKey)); - // Sized to its three tabs at the right edge, on a phone as when wide. - expect(pill.right, width - 16); - expect( - pill.width, - FloatingDestinationBar.rowWidth( - cupertino: cupertino, - tabs: PipelineDetailTab.values.length, - ), - ); - for (final tab in PipelineDetailTab.values) { - final rect = tester.getRect( - find.byKey(ValueKey('pipeline-detail-tab-${tab.name}')), - ); - expect(rect.left, greaterThanOrEqualTo(pill.left), reason: tab.name); - expect(rect.right, lessThanOrEqualTo(pill.right), reason: tab.name); - } - await tester.tap(find.byKey(const Key('pipeline-detail-tab-source'))); - await tester.pumpAndSettle(); - expect(selected, PipelineDetailTab.source); - expect(tester.takeException(), isNull); - }); - } + expect(rect.left, greaterThanOrEqualTo(pill.left), reason: tab.name); + expect(rect.right, lessThanOrEqualTo(pill.right), reason: tab.name); + } + await tester.tap(find.byKey(const Key('pipeline-detail-tab-source'))); + await tester.pumpAndSettle(); + expect(selected, PipelineDetailTab.source); + expect(tester.takeException(), isNull); + }); } } diff --git a/app/test/features/pipelines/pipelines_adaptive_test.dart b/app/test/features/pipelines/pipelines_adaptive_test.dart index 061e0fee..69eaf249 100644 --- a/app/test/features/pipelines/pipelines_adaptive_test.dart +++ b/app/test/features/pipelines/pipelines_adaptive_test.dart @@ -1,15 +1,11 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:pipelines_app/ui/layout/app_list_row.dart'; import '../../native_back.dart'; import 'package:pipelines_app/features/graph/widgets/definition_graph_view.dart'; import 'package:pipelines_app/features/pipelines/pipeline_repository.dart'; import 'package:pipelines_app/features/pipelines/pipelines_controller.dart'; import 'package:pipelines_app/features/pipelines/screen.dart'; import 'package:pipelines_app/features/pipelines/widgets/pipeline_detail_panel.dart'; -import 'package:pipelines_app/ui/adaptive/floating_destination_bar.dart'; import 'fixtures.dart'; import 'test_helpers.dart'; @@ -110,66 +106,6 @@ void main() { expect(find.byKey(const Key('pipeline-detail')), findsOneWidget); }); - testWidgets('iOS uses Cupertino scaffolds, list tiles and segmented tabs', ( - tester, - ) async { - debugDefaultTargetPlatformOverride = TargetPlatform.iOS; - tester.view.physicalSize = const Size(1100, 900); - tester.view.devicePixelRatio = 1; - addTearDown(tester.view.resetPhysicalSize); - addTearDown(tester.view.resetDevicePixelRatio); - final fixture = PipelineFixture(); - try { - await tester.pumpWidget( - CupertinoApp(home: PipelinesScreen(gateway: gatewayFor(fixture))), - ); - await tester.pumpAndSettle(); - - expect(find.byType(CupertinoPageScaffold), findsOneWidget); - // The shared list row, in its Cupertino form. - expect( - tester - .widget(find.byKey(const Key('pipeline-row-1'))) - .cupertino, - isTrue, - ); - expect(find.byType(CupertinoActionSheet), findsNothing); - await tester.tap(find.byKey(const Key('pipeline-row-1'))); - await tester.pumpAndSettle(); - // The tabs are the floating glass Cupertino tab bar. - expect( - find.descendant( - of: find.byKey(const Key('pipeline-detail-tabs')), - matching: find.byType(FloatingDestinationBar), - ), - findsOneWidget, - ); - // Versions are the shared row in its Cupertino form, flat on the page. - expect( - tester - .widget(find.byKey(const Key('pipeline-version-1'))) - .cupertino, - isTrue, - ); - expect(find.byType(CupertinoListSection), findsNothing); - - await tester.tap(find.byKey(const Key('pipeline-version-1'))); - await tester.pumpAndSettle(); - expect(find.text('Viewing v1 (latest v2).'), findsOneWidget); - await tester.tap(find.byKey(const Key('pipeline-detail-tab-source'))); - await tester.pump(); - expect( - selectableText( - 'name: Alpha review\nstages:\n review:\n type: model\n' - '# selected version 1', - ), - findsOneWidget, - ); - } finally { - debugDefaultTargetPlatformOverride = null; - } - }); - testWidgets('3x text in a very short panel keeps the tabs reachable', ( tester, ) async { diff --git a/app/test/features/pipelines/pipelines_screen_filter_test.dart b/app/test/features/pipelines/pipelines_screen_filter_test.dart index 0ac94f43..65a5d88d 100644 --- a/app/test/features/pipelines/pipelines_screen_filter_test.dart +++ b/app/test/features/pipelines/pipelines_screen_filter_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/pipelines/screen.dart'; @@ -136,21 +135,15 @@ void main() { expect(find.text('Beta deploy'), findsOneWidget); }); - for (final cupertino in [false, true]) { - testWidgets('Schedules opens from the bar (cupertino: $cupertino)', ( - tester, - ) async { - var opened = 0; - final screen = PipelinesScreen( - gateway: gatewayFor(PipelineFixture()), - onOpenSchedules: () => opened++, - ); - await tester.pumpWidget( - cupertino ? CupertinoApp(home: screen) : MaterialApp(home: screen), - ); - await tester.pumpAndSettle(); - await tester.tap(find.byKey(const Key('pipelines-open-schedules'))); - expect(opened, 1); - }); - } + testWidgets('Schedules opens from the bar', (tester) async { + var opened = 0; + final screen = PipelinesScreen( + gateway: gatewayFor(PipelineFixture()), + onOpenSchedules: () => opened++, + ); + await tester.pumpWidget(MaterialApp(home: screen)); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(const Key('pipelines-open-schedules'))); + expect(opened, 1); + }); } diff --git a/app/test/features/pipelines/ui/run_pipeline_launch_test.dart b/app/test/features/pipelines/ui/run_pipeline_launch_test.dart index afe8897f..d611ca9f 100644 --- a/app/test/features/pipelines/ui/run_pipeline_launch_test.dart +++ b/app/test/features/pipelines/ui/run_pipeline_launch_test.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'dart:convert'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -53,17 +52,14 @@ JsonMap noRun() => {'type': 'run', 'run_detail': null}; Future pumpScreen( WidgetTester tester, FakeGateway gateway, - List navigated, { - bool cupertino = false, -}) async { + List navigated, +) async { tester.view.physicalSize = const Size(1100, 900); tester.view.devicePixelRatio = 1; addTearDown(tester.view.resetPhysicalSize); addTearDown(tester.view.resetDevicePixelRatio); final screen = PipelinesScreen(gateway: gateway, onRunStarted: navigated.add); - await tester.pumpWidget( - cupertino ? CupertinoApp(home: screen) : MaterialApp(home: screen), - ); + await tester.pumpWidget(MaterialApp(home: screen)); await tester.pumpAndSettle(); } @@ -582,74 +578,6 @@ void main() { expect(navigated, [86]); }); - testWidgets('the Cupertino host shows the same native prompt and words', ( - tester, - ) async { - final fixture = PipelineFixture(); - final navigated = []; - final gateway = launchGateway( - fixture, - onLaunch: (fields) => acceptedRun(84), - ); - await pumpScreen(tester, gateway, navigated, cupertino: true); - await openDetail(tester); - await tester.tap(find.byKey(runPipelineActionKey)); - await tester.pumpAndSettle(); - - expect(find.byType(CupertinoAlertDialog), findsOneWidget); - expect(find.byType(AlertDialog), findsNothing); - expect(find.text('Run Alpha review'), findsOneWidget); - expect(find.text(runPipelinePromptLabel), findsOneWidget); - expect(find.text(runPipelineWorkspaceLabel), findsOneWidget); - expect(find.text(runPipelineNotifyLabel), findsOneWidget); - expect( - find.descendant( - of: find.byType(CupertinoAlertDialog), - matching: find.text(runPipelineConfirmLabel), - ), - findsOneWidget, - ); - expect(find.text(runPipelineCancelLabel), findsOneWidget); - expect(gateway.callsOf('run_pipeline'), isEmpty); - - await tester.tap(find.byKey(runPipelineCancelKey)); - await tester.pumpAndSettle(); - expect(find.byType(CupertinoAlertDialog), findsNothing); - expect(gateway.callsOf('run_pipeline'), isEmpty); - }); - - testWidgets('Cupertino field labels and helper use theme label roles', ( - tester, - ) async { - final fixture = PipelineFixture(); - final gateway = launchGateway( - fixture, - onLaunch: (fields) => acceptedRun(87), - ); - await pumpScreen(tester, gateway, [], cupertino: true); - await openDetail(tester); - await tester.tap(find.byKey(runPipelineActionKey)); - await tester.pumpAndSettle(); - - final context = tester.element(find.byType(CupertinoAlertDialog)); - final theme = CupertinoTheme.of(context); - final labelStyle = theme.textTheme.textStyle; - for (final label in [ - runPipelinePromptLabel, - runPipelineWorkspaceLabel, - runPipelineNotifyLabel, - ]) { - final style = tester.widget(find.text(label)).style; - expect(style?.color, labelStyle.color, reason: label); - expect(style?.fontSize, labelStyle.fontSize, reason: label); - } - final helper = tester - .widget(find.text(runPipelineWorkspaceHelper)) - .style; - expect(helper?.color, CupertinoColors.secondaryLabel.resolveFrom(context)); - expect(helper?.fontSize, theme.textTheme.tabLabelTextStyle.fontSize); - }); - testWidgets('Schedule… leaves the run dialog for the schedule editor', ( tester, ) async { 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 9b7db1c5..16678a90 100644 --- a/app/test/ui/adaptive/icon_only_tab_bars_test.dart +++ b/app/test/ui/adaptive/icon_only_tab_bars_test.dart @@ -55,6 +55,8 @@ void main() { for (final cupertino in [false, true]) { final name = cupertino ? 'Cupertino' : 'Material'; for (final MapEntry(key: label, value: (bar, tabs)) in bars.entries) { + // The pipeline detail bar is Material on every host. + if (cupertino && label == 'pipeline detail') continue; testWidgets('$name $label tabs are icons named for assistive ' 'technology', (tester) async { final semantics = tester.ensureSemantics();