Merge commit '03915fbb35c202d554d9e4cbc1549c0c4e62bdef' into pipelines/run-20261111-0431-cupertino-out-chat-shell-2721

This commit is contained in:
2026-11-11 04:42:43 +00:00
26 changed files with 144 additions and 589 deletions
+1 -7
View File
@@ -73,19 +73,13 @@ class _SchedulesScreenState extends State<SchedulesScreen> {
@override
Widget build(BuildContext context) {
final cupertino =
Localizations.of<MaterialLocalizations>(
context,
MaterialLocalizations,
) ==
null;
return AnimatedBuilder(
animation: _controller,
builder: (context, _) => SchedulesListView(
controller: _controller,
searchController: _searchController,
scrollController: _scrollController,
cupertino: cupertino,
cupertino: false,
onOpen: widget.onOpen,
onRefresh: () => unawaited(_controller.refresh()),
),
@@ -1,29 +1,15 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/host.dart';
/// Secondary text under a field, using the host's own colours and text theme.
/// Secondary text under a field, using the app's colours and text theme.
TextStyle scheduleEditorSecondaryStyle(BuildContext context) {
if (usesCupertinoHost(context)) {
// The host's own secondary-label style; no invented point size.
return CupertinoTheme.of(context).textTheme.tabLabelTextStyle.copyWith(
color: CupertinoColors.secondaryLabel.resolveFrom(context),
);
}
final theme = Theme.of(context);
return (theme.textTheme.bodySmall ?? const TextStyle()).copyWith(
color: theme.colorScheme.onSurfaceVariant,
);
}
/// The host's semantic error colour, never a form-specific palette.
/// The app's semantic error colour, never a form-specific palette.
TextStyle scheduleEditorErrorStyle(BuildContext context) {
if (usesCupertinoHost(context)) {
return CupertinoTheme.of(context).textTheme.textStyle.copyWith(
color: CupertinoColors.systemRed.resolveFrom(context),
);
}
return TextStyle(color: Theme.of(context).colorScheme.error);
}
@@ -47,9 +33,7 @@ class ScheduleEditorField extends StatelessWidget {
@override
Widget build(BuildContext context) {
final labelStyle = usesCupertinoHost(context)
? CupertinoTheme.of(context).textTheme.textStyle
: Theme.of(context).textTheme.bodyMedium;
final labelStyle = Theme.of(context).textTheme.bodyMedium;
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -103,27 +87,16 @@ class ScheduleEditorTextField extends StatelessWidget {
@override
Widget build(BuildContext context) {
final field = usesCupertinoHost(context)
? CupertinoTextField(
key: fieldKey,
controller: controller,
enabled: enabled,
keyboardType: keyboardType,
minLines: minLines,
maxLines: maxLines,
textInputAction: textInputAction,
onChanged: onChanged,
)
: TextField(
key: fieldKey,
controller: controller,
enabled: enabled,
keyboardType: keyboardType,
minLines: minLines,
maxLines: maxLines,
textInputAction: textInputAction,
onChanged: onChanged,
);
final field = TextField(
key: fieldKey,
controller: controller,
enabled: enabled,
keyboardType: keyboardType,
minLines: minLines,
maxLines: maxLines,
textInputAction: textInputAction,
onChanged: onChanged,
);
return MergeSemantics(
child: ScheduleEditorField(
label: label,
@@ -156,17 +129,11 @@ class ScheduleEditorSwitchField extends StatelessWidget {
@override
Widget build(BuildContext context) {
final control = usesCupertinoHost(context)
? CupertinoSwitch(
key: switchKey,
value: value,
onChanged: enabled ? onChanged : null,
)
: Switch(
key: switchKey,
value: value,
onChanged: enabled ? onChanged : null,
);
final control = Switch(
key: switchKey,
value: value,
onChanged: enabled ? onChanged : null,
);
return MergeSemantics(
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -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 '../../domain/editor/schedule_draft.dart';
import '../../domain/schedule_rule.dart';
import 'schedule_editor_form_body.dart';
@@ -151,7 +149,6 @@ class _ScheduleEditorFormState extends State<ScheduleEditorForm> {
@override
Widget build(BuildContext context) {
final cupertino = usesCupertinoHost(context);
return ScheduleEditorFormBody(
heading: _heading,
showHeading: widget.showHeading,
@@ -193,25 +190,17 @@ class _ScheduleEditorFormState extends State<ScheduleEditorForm> {
runSpacing: 8,
children: [
if (widget.onCancel != null)
_cancelButton(cupertino)
_cancelButton()
else
const SizedBox.shrink(),
_saveButton(cupertino),
_saveButton(),
],
),
);
}
Widget _cancelButton(bool cupertino) {
Widget _cancelButton() {
final onPressed = _sending ? null : widget.onCancel;
if (cupertino) {
return CupertinoButton(
key: scheduleEditorCancelKey,
padding: EdgeInsets.zero,
onPressed: onPressed,
child: const Text(scheduleEditorCancelLabel),
);
}
return TextButton(
key: scheduleEditorCancelKey,
onPressed: onPressed,
@@ -219,18 +208,11 @@ class _ScheduleEditorFormState extends State<ScheduleEditorForm> {
);
}
Widget _saveButton(bool cupertino) {
Widget _saveButton() {
final label = Text(
_sending ? scheduleEditorSendingLabel : scheduleEditorSubmitLabel,
);
final onPressed = _sending ? null : _submit;
if (cupertino) {
return CupertinoButton.filled(
key: scheduleEditorSubmitKey,
onPressed: onPressed,
child: label,
);
}
return FilledButton(
key: scheduleEditorSubmitKey,
onPressed: onPressed,
@@ -1,7 +1,5 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/host.dart';
import '../../domain/editor/schedule_draft.dart';
import 'schedule_editor_fields.dart';
import 'schedule_editor_selectors.dart';
@@ -100,10 +98,7 @@ class ScheduleEditorFormBody extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cupertino = usesCupertinoHost(context);
final titleStyle = cupertino
? CupertinoTheme.of(context).textTheme.navLargeTitleTextStyle
: Theme.of(context).textTheme.titleLarge;
final titleStyle = Theme.of(context).textTheme.titleLarge;
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -1,7 +1,5 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/host.dart';
import '../../domain/schedule_rule.dart';
import 'schedule_editor_fields.dart';
@@ -17,7 +15,7 @@ class ScheduleEditorChoice<T> {
final String label;
}
/// A native drop-down on Material and a native action sheet on Cupertino.
/// A native drop-down of the field's options.
class ScheduleEditorChoiceField<T> extends StatelessWidget {
const ScheduleEditorChoiceField({
super.key,
@@ -40,65 +38,22 @@ class ScheduleEditorChoiceField<T> extends StatelessWidget {
final String? error;
final Key? fieldKey;
String get _selectedLabel {
for (final option in options) {
if (option.value == value) return option.label;
}
return '';
}
Future<void> _choose(BuildContext context) async {
final chosen = await showCupertinoModalPopup<T>(
context: context,
builder: (sheetContext) => CupertinoActionSheet(
title: Text(label),
actions: [
for (final option in options)
CupertinoActionSheetAction(
onPressed: () => Navigator.pop(sheetContext, option.value),
child: Text(option.label),
),
],
cancelButton: CupertinoActionSheetAction(
onPressed: () => Navigator.pop(sheetContext),
child: const Text('Cancel'),
),
),
);
if (chosen != null) onChanged(chosen);
}
@override
Widget build(BuildContext context) {
final control = usesCupertinoHost(context)
? CupertinoButton(
key: fieldKey,
padding: EdgeInsets.zero,
onPressed: enabled ? () => _choose(context) : null,
child: Row(
children: [
Expanded(child: Text(_selectedLabel)),
const Icon(CupertinoIcons.chevron_down),
],
),
)
: DropdownButtonFormField<T>(
key: fieldKey,
initialValue: value,
isExpanded: true,
items: [
for (final option in options)
DropdownMenuItem<T>(
value: option.value,
child: Text(option.label),
),
],
onChanged: enabled
? (chosen) {
if (chosen != null) onChanged(chosen);
}
: null,
);
final control = DropdownButtonFormField<T>(
key: fieldKey,
initialValue: value,
isExpanded: true,
items: [
for (final option in options)
DropdownMenuItem<T>(value: option.value, child: Text(option.label)),
],
onChanged: enabled
? (chosen) {
if (chosen != null) onChanged(chosen);
}
: null,
);
return MergeSemantics(
child: ScheduleEditorField(
label: label,
@@ -164,18 +119,11 @@ class _DayToggle extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cupertino = usesCupertinoHost(context);
final checkbox = cupertino
? CupertinoCheckbox(
key: scheduleEditorDayKey(day),
value: selected,
onChanged: enabled ? (_) => onTap() : null,
)
: Checkbox(
key: scheduleEditorDayKey(day),
value: selected,
onChanged: enabled ? (_) => onTap() : null,
);
final checkbox = Checkbox(
key: scheduleEditorDayKey(day),
value: selected,
onChanged: enabled ? (_) => onTap() : null,
);
final content = Padding(
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
child: Row(
@@ -184,17 +132,11 @@ class _DayToggle extends StatelessWidget {
),
);
return MergeSemantics(
child: cupertino
? GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: enabled ? onTap : null,
child: content,
)
: InkWell(
borderRadius: BorderRadius.circular(8),
onTap: enabled ? onTap : null,
child: content,
),
child: InkWell(
borderRadius: BorderRadius.circular(8),
onTap: enabled ? onTap : null,
child: content,
),
);
}
}
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/layout/app_list_avatar.dart';
@@ -27,10 +26,10 @@ class ScheduleListRow extends StatelessWidget {
@override
Widget build(BuildContext context) {
return AppListRow(
cupertino: cupertino,
cupertino: false,
divider: divider,
onTap: onOpen,
leading: ScheduleAvatar(schedule: schedule, cupertino: cupertino),
leading: ScheduleAvatar(schedule: schedule, cupertino: false),
title: Text(scheduleDisplayName(schedule)),
time: scheduleNextDueShort(schedule),
subtitle: Text(
@@ -56,17 +55,13 @@ class ScheduleAvatar extends StatelessWidget {
@override
Widget build(BuildContext context) {
final Color? enabled = schedule.enabled
? (cupertino
? CupertinoColors.systemGreen.resolveFrom(context)
: Colors.green.shade700)
: null;
final Color? enabled = schedule.enabled ? Colors.green.shade700 : null;
return Semantics(
label: scheduleStatusLabel(schedule),
child: ExcludeSemantics(
child: AppListAvatar(
foreground: enabled,
child: Icon(cupertino ? CupertinoIcons.clock : Icons.schedule),
child: const Icon(Icons.schedule),
),
),
);
@@ -30,7 +30,7 @@ class ScheduleRefreshAction extends StatelessWidget {
@override
Widget build(BuildContext context) => BarIconButton(
key: controller.isLoading ? null : scheduleRefreshKey,
cupertino: cupertino,
cupertino: false,
icon: Icons.refresh,
cupertinoIcon: CupertinoIcons.refresh,
label: 'Refresh schedules',
@@ -69,7 +69,7 @@ class ScheduleListToolbar extends StatelessWidget {
final refresh = switch (onRefresh) {
final refresh? => ScheduleRefreshAction(
controller: controller,
cupertino: cupertino,
cupertino: false,
onRefresh: refresh,
),
null => null,
@@ -119,29 +119,13 @@ class ScheduleListToolbar extends StatelessWidget {
Widget _search(BuildContext context) => AppSearchField(
fieldKey: scheduleSearchFieldKey,
controller: searchController,
cupertino: cupertino,
cupertino: false,
placeholder: 'Search schedules',
onChanged: controller.setQuery,
onCleared: controller.clearQuery,
);
Widget _filter(BuildContext context) {
if (cupertino) {
return CupertinoSlidingSegmentedControl<ScheduleListFilter>(
key: scheduleFilterKey,
groupValue: controller.filter,
onValueChanged: (value) {
if (value != null) controller.setFilter(value);
},
children: {
for (final filter in ScheduleListFilter.values)
filter: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
child: Text(filter.label),
),
},
);
}
return SegmentedButton<ScheduleListFilter>(
key: scheduleFilterKey,
segments: [
@@ -159,12 +143,8 @@ class ScheduleListToolbar extends StatelessWidget {
);
}
TextStyle? _metaStyle(BuildContext context) => cupertino
? CupertinoTheme.of(context).textTheme.textStyle.copyWith(
fontSize: 15,
color: CupertinoColors.secondaryLabel.resolveFrom(context),
)
: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
);
TextStyle? _metaStyle(BuildContext context) => Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant);
}
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/floating_bar_layout.dart';
@@ -55,13 +54,13 @@ class SchedulesListView extends StatelessWidget {
edge: FloatingBarEdge.top,
bar: TopGlassStrip(
key: scheduleToolbarKey,
cupertino: cupertino,
cupertino: false,
maxWidth: kScheduleToolbarMaxWidth,
padding: EdgeInsets.zero,
child: ScheduleListToolbar(
controller: controller,
searchController: searchController,
cupertino: cupertino,
cupertino: false,
onRefresh: refreshInToolbar ? onRefresh : null,
),
),
@@ -118,7 +117,7 @@ class SchedulesListView extends StatelessWidget {
'schedule-row-$index-${schedule.id ?? 'unknown'}',
),
schedule: schedule,
cupertino: cupertino,
cupertino: false,
divider: index < schedules.length - 1,
onOpen: () => onOpen(schedule),
),
@@ -136,9 +135,7 @@ class SchedulesListView extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
cupertino
? const CupertinoActivityIndicator()
: const CircularProgressIndicator(),
const CircularProgressIndicator(),
const SizedBox(height: 12),
const Text('Loading schedules…'),
],
@@ -161,9 +158,7 @@ class SchedulesListView extends StatelessWidget {
detail,
textAlign: TextAlign.center,
style: TextStyle(
color: cupertino
? CupertinoColors.secondaryLabel.resolveFrom(context)
: Theme.of(context).colorScheme.onSurfaceVariant,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
),
@@ -204,9 +199,7 @@ class SchedulesListView extends StatelessWidget {
}
Widget _failureText(BuildContext context, ScheduleListFailure failure) {
final color = cupertino
? CupertinoColors.systemRed.resolveFrom(context)
: Theme.of(context).colorScheme.error;
final color = Theme.of(context).colorScheme.error;
return Semantics(
liveRegion: true,
child: Text(
@@ -218,14 +211,6 @@ class SchedulesListView extends StatelessWidget {
}
Widget _retryButton() {
if (cupertino) {
return CupertinoButton(
key: scheduleRetryKey,
padding: EdgeInsets.zero,
onPressed: onRefresh,
child: const Text('Retry'),
);
}
return TextButton(
key: scheduleRetryKey,
onPressed: onRefresh,
@@ -1,7 +1,5 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/host.dart';
import 'schedule_pipeline_wording.dart';
/// Deletes the exact schedule revision. Returns null once the server accepted
@@ -18,13 +16,6 @@ Future<void> showScheduleDeleteDialog({
required ScheduleDeleteSubmit onSubmit,
}) {
final prompt = _ScheduleDeletePrompt(name: name, onSubmit: onSubmit);
if (usesCupertinoHost(context)) {
return showCupertinoDialog<void>(
context: context,
barrierDismissible: false,
builder: (_) => prompt,
);
}
return showDialog<void>(
context: context,
barrierDismissible: false,
@@ -70,10 +61,7 @@ class _ScheduleDeletePromptState extends State<_ScheduleDeletePrompt> {
@override
Widget build(BuildContext context) {
final dialog = usesCupertinoHost(context)
? _cupertino(context)
: _material(context);
return PopScope(canPop: !_sending, child: dialog);
return PopScope(canPop: !_sending, child: _material(context));
}
Widget _material(BuildContext context) {
@@ -98,30 +86,6 @@ class _ScheduleDeletePromptState extends State<_ScheduleDeletePrompt> {
);
}
Widget _cupertino(BuildContext context) {
return CupertinoAlertDialog(
title: Text(scheduleDeleteTitle(widget.name)),
content: _body(
errorStyle: TextStyle(
color: CupertinoColors.systemRed.resolveFrom(context),
),
),
actions: [
CupertinoDialogAction(
key: scheduleDeleteKeepKey,
onPressed: _sending ? null : _keep,
child: const Text(scheduleDeleteKeepLabel),
),
CupertinoDialogAction(
key: scheduleDeleteConfirmKey,
isDestructiveAction: true,
onPressed: _sending ? null : _confirm,
child: const Text(scheduleDeleteConfirmLabel),
),
],
);
}
Widget _body({required TextStyle errorStyle}) {
return Column(
mainAxisSize: MainAxisSize.min,
@@ -1,11 +1,9 @@
import '../../../../ui/adaptive/segmented_bar.dart';
import 'dart:math';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../core/api_gateway.dart';
import '../../../../ui/adaptive/host.dart';
import '../../domain/editor/schedule_draft.dart';
import '../editor/schedule_editor_form.dart';
import '../editor/schedule_editor_wording.dart';
@@ -40,22 +38,14 @@ Future<void> openSchedulePipelineEditor(
final title = draft.source == null
? scheduleEditorAddTitle
: scheduleEditorEditTitle;
final route = usesCupertinoHost(context)
? CupertinoPageRoute<void>(
settings: settings,
builder: (_) => CupertinoPageScaffold(
navigationBar: SegmentedBar(cupertino: true, title: title),
child: SafeArea(child: page),
),
)
: MaterialPageRoute<void>(
settings: settings,
builder: (_) => Scaffold(
extendBodyBehindAppBar: true,
appBar: SegmentedBar(cupertino: false, title: title),
body: SafeArea(child: page),
),
);
final route = MaterialPageRoute<void>(
settings: settings,
builder: (_) => Scaffold(
extendBodyBehindAppBar: true,
appBar: SegmentedBar(cupertino: false, title: title),
body: SafeArea(child: page),
),
);
return Navigator.of(context).push(route);
}
@@ -1,7 +1,5 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/host.dart';
import '../../../../ui/layout/section_heading.dart';
import '../../domain/saved_schedule.dart';
import '../list/schedule_list_controller.dart';
@@ -83,24 +81,12 @@ class SchedulePipelineListBody extends StatelessWidget {
/// the section reloads after every accepted change and offers Retry when a
/// load fails.
Widget _header(BuildContext context) {
final cupertino = usesCupertinoHost(context);
final add = cupertino
? CupertinoButton(
key: scheduleAddKey,
padding: EdgeInsets.zero,
minimumSize: const Size.square(44),
onPressed: onAdd,
child: const Icon(
CupertinoIcons.add,
semanticLabel: scheduleAddLabel,
),
)
: IconButton(
key: scheduleAddKey,
tooltip: scheduleAddLabel,
onPressed: onAdd,
icon: const Icon(Icons.add),
);
final add = IconButton(
key: scheduleAddKey,
tooltip: scheduleAddLabel,
onPressed: onAdd,
icon: const Icon(Icons.add),
);
return SectionHeading(
title: controller.hasLoaded && controller.failure == null
? '$scheduleSectionTitle (${controller.schedules.length})'
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/host.dart';
import '../../../../ui/layout/app_list_row.dart';
import '../../../../ui/layout/app_overflow_menu.dart';
import '../../domain/saved_schedule.dart';
@@ -39,12 +38,11 @@ class SchedulePipelineRow extends StatelessWidget {
@override
Widget build(BuildContext context) {
final id = schedule.id;
final cupertino = usesCupertinoHost(context);
final row = AppListRow(
cupertino: cupertino,
cupertino: false,
divider: divider && error == null,
onTap: busy ? null : onEdit,
leading: ScheduleAvatar(schedule: schedule, cupertino: cupertino),
leading: ScheduleAvatar(schedule: schedule, cupertino: false),
title: Text(scheduleDisplayName(schedule)),
time: scheduleNextDueShort(schedule),
subtitle: Text(
@@ -1,21 +1,11 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/adaptive/host.dart';
/// Host text roles and standard buttons for the pipeline schedule section.
/// Material text roles and standard buttons for the pipeline schedule section.
/// No palette, font family or explicit point size is introduced.
TextStyle? schedulePipelineHeadingStyle(BuildContext context) =>
usesCupertinoHost(context)
? CupertinoTheme.of(context).textTheme.navTitleTextStyle
: Theme.of(context).textTheme.titleMedium;
Theme.of(context).textTheme.titleMedium;
TextStyle? schedulePipelineMutedStyle(BuildContext context) {
if (usesCupertinoHost(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,
@@ -25,32 +15,18 @@ TextStyle? schedulePipelineMutedStyle(BuildContext context) {
TextStyle? schedulePipelineStatusStyle(BuildContext context, bool enabled) {
final base = schedulePipelineMutedStyle(context);
if (!enabled) return base;
return usesCupertinoHost(context)
? base?.copyWith(color: CupertinoTheme.of(context).primaryColor)
: base?.copyWith(color: Theme.of(context).colorScheme.primary);
return base?.copyWith(color: Theme.of(context).colorScheme.primary);
}
TextStyle? schedulePipelineErrorStyle(BuildContext context) =>
usesCupertinoHost(context)
? CupertinoTheme.of(context).textTheme.textStyle.copyWith(
color: CupertinoColors.systemRed.resolveFrom(context),
)
: TextStyle(color: Theme.of(context).colorScheme.error);
TextStyle(color: Theme.of(context).colorScheme.error);
/// A standard platform text action.
/// A standard text action.
Widget schedulePipelineTextButton(
BuildContext context, {
required String label,
required VoidCallback? onPressed,
Key? key,
}) {
if (usesCupertinoHost(context)) {
return CupertinoButton(
key: key,
padding: EdgeInsets.zero,
onPressed: onPressed,
child: Text(label),
);
}
return TextButton(key: key, onPressed: onPressed, child: Text(label));
}
@@ -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 '../../data/schedules_repository.dart';
import '../../domain/editor/schedule_draft.dart';
import '../../domain/schedule_json.dart';
@@ -84,19 +82,11 @@ class _ScheduleRunActionState extends State<ScheduleRunAction> {
@override
Widget build(BuildContext context) {
if (!canScheduleRun(widget.run)) return const SizedBox.shrink();
final cupertino = usesCupertinoHost(context);
final action = cupertino
? CupertinoButton.tinted(
sizeStyle: CupertinoButtonSize.small,
key: scheduleRunActionKey,
onPressed: _open,
child: const Text(scheduleRunActionLabel),
)
: OutlinedButton(
key: scheduleRunActionKey,
onPressed: _open,
child: const Text(scheduleRunActionLabel),
);
final action = OutlinedButton(
key: scheduleRunActionKey,
onPressed: _open,
child: const Text(scheduleRunActionLabel),
);
return Tooltip(message: scheduleRunActionHint, child: action);
}
}
@@ -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/core/api_gateway.dart';
@@ -31,7 +30,6 @@ Future<void> pumpScheduleEditor(
WidgetTester tester, {
required ScheduleDraft draft,
required Future<void> Function(JsonMap record) onSubmit,
bool cupertino = false,
bool dark = false,
double width = 390,
double height = 1600,
@@ -57,21 +55,11 @@ Future<void> pumpScheduleEditor(
child: app!,
);
await tester.pumpWidget(
cupertino
? CupertinoApp(
theme: CupertinoThemeData(
brightness: dark ? Brightness.dark : Brightness.light,
),
builder: scaled,
home: CupertinoPageScaffold(child: SafeArea(child: form)),
)
: MaterialApp(
theme: ThemeData(
brightness: dark ? Brightness.dark : Brightness.light,
),
builder: scaled,
home: Scaffold(body: SafeArea(child: form)),
),
MaterialApp(
theme: ThemeData(brightness: dark ? Brightness.dark : Brightness.light),
builder: scaled,
home: Scaffold(body: SafeArea(child: form)),
),
);
await tester.pumpAndSettle();
}
@@ -1,10 +1,8 @@
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';
import 'package:pipelines_app/features/schedules/ui/editor/schedule_editor_selectors.dart';
import 'package:pipelines_app/features/schedules/ui/editor/schedule_editor_wording.dart';
import 'schedule_editor_harness.dart';
@@ -101,49 +99,6 @@ void main() {
);
});
testWidgets('Cupertino form uses native fields and action sheets', (
tester,
) async {
final calls = <JsonMap>[];
await pumpScheduleEditor(
tester,
cupertino: true,
draft: createDraft(name: 'Cupertino schedule', prompt: 'Native fields'),
onSubmit: (record) async => calls.add(record),
);
expect(find.byType(CupertinoTextField), findsNWidgets(6));
expect(find.byType(TextField), findsNothing);
expect(find.byType(CupertinoSwitch), findsOneWidget);
expect(find.byType(Switch), findsNothing);
expect(find.byType(CupertinoCheckbox), findsNWidgets(7));
expect(find.byType(Checkbox), findsNothing);
await tester.tap(find.byKey(scheduleEditorTimerKey));
await tester.pumpAndSettle();
await tester.tap(find.text('Clock times').last);
await tester.pumpAndSettle();
await enterField(tester, scheduleEditorTimesKey, '06:30');
await tester.tap(find.byKey(scheduleEditorDayKey('mon')));
await tester.pump();
expect(
tester
.widget<CupertinoCheckbox>(find.byKey(scheduleEditorDayKey('mon')))
.value,
isTrue,
);
await tester.tap(find.byKey(scheduleEditorEnabledKey));
await tester.pump();
await tester.tap(find.byKey(scheduleEditorSubmitKey));
await tester.pumpAndSettle();
expect(calls.single['enabled'], isFalse);
expect(calls.single['rule'], {
'times': ['06:30'],
'days': ['mon'],
'timezone': 'Europe/London',
});
});
testWidgets('Cancel calls the injected callback and sends nothing', (
tester,
) async {
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -44,37 +43,4 @@ void main() {
);
expect(note.size.width, lessThanOrEqualTo(320 - 32));
});
testWidgets('Cupertino dark uses native controls and the native palette', (
tester,
) async {
await pumpScheduleEditor(
tester,
cupertino: true,
dark: true,
width: 320,
height: 1800,
textScale: 2,
draft: createDraft(),
onSubmit: (JsonMap record) async {},
);
expect(tester.takeException(), isNull);
for (final label in _labels) {
expect(find.text(label), findsOneWidget, reason: label);
}
expect(find.byType(CupertinoTextField), findsNWidgets(6));
expect(find.byType(CupertinoSwitch), findsOneWidget);
expect(find.byType(CupertinoCheckbox), findsNWidgets(7));
expect(find.byType(Material), findsNothing);
expect(find.byType(TextField), findsNothing);
expect(find.byType(Switch), findsNothing);
expect(find.byType(Checkbox), findsNothing);
final context = tester.element(find.byKey(scheduleEditorNameKey));
expect(CupertinoTheme.of(context).brightness, Brightness.dark);
expect(
CupertinoColors.label.resolveFrom(context).toARGB32(),
CupertinoColors.label.darkColor.toARGB32(),
);
});
}
@@ -1,6 +1,5 @@
import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:pipelines_app/core/api_gateway.dart';
@@ -119,23 +118,13 @@ List<JsonMap> longScheduleList(int count) => [
),
];
Widget schedulesApp(
Widget child, {
required bool cupertino,
double textScale = 1,
}) {
Widget schedulesApp(Widget child, {double textScale = 1}) {
Widget media(BuildContext context, Widget? app) => MediaQuery(
data: MediaQuery.of(
context,
).copyWith(textScaler: TextScaler.linear(textScale)),
child: app!,
);
if (cupertino) {
return CupertinoApp(
builder: media,
home: CupertinoPageScaffold(child: SafeArea(child: child)),
);
}
return MaterialApp(
builder: media,
home: Scaffold(body: child),
@@ -8,7 +8,6 @@ import 'schedule_list_test_support.dart';
Future<void> pumpSchedules(
WidgetTester tester, {
required bool cupertino,
required ApiGateway gateway,
ValueChanged<SavedSchedule>? onOpen,
double textScale = 1,
@@ -22,7 +21,6 @@ Future<void> pumpSchedules(
await tester.pumpWidget(
schedulesApp(
SchedulesScreen(gateway: gateway, onOpen: onOpen ?? (_) {}),
cupertino: cupertino,
textScale: textScale,
),
);
@@ -17,12 +17,7 @@ void main() {
pausedRecord(),
]),
);
await pumpSchedules(
tester,
cupertino: false,
gateway: gateway,
textScale: textScale,
);
await pumpSchedules(tester, gateway: gateway, textScale: textScale);
expect(find.text('2 schedules'), findsOneWidget);
// The strip carries the count only; the helper line lives in the
@@ -51,10 +46,7 @@ void main() {
expect(find.text('Paused'), findsOneWidget);
expect(find.byKey(scheduleSearchFieldKey), findsOneWidget);
expect(
find.byType(SegmentedButton<ScheduleListFilter>),
findsOneWidget,
);
expect(find.byType(SegmentedButton<ScheduleListFilter>), findsOneWidget);
expect(find.byType(TextField), findsOneWidget);
expect(tester.takeException(), isNull);
});
@@ -14,7 +14,7 @@ void main() {
(type, fields) async =>
schedulesReply([scheduleRecord(), pausedRecord()]),
);
await pumpSchedules(tester, cupertino: false, gateway: gateway);
await pumpSchedules(tester, gateway: gateway);
await tester.enterText(
find.byKey(scheduleSearchFieldKey),
@@ -42,7 +42,7 @@ void main() {
final gateway = FakeSchedulesGateway(
(type, fields) async => schedulesReply(longScheduleList(30)),
);
await pumpSchedules(tester, cupertino: false, gateway: gateway);
await pumpSchedules(tester, gateway: gateway);
final list = find.byKey(scheduleListKey);
await tester.drag(list, const Offset(0, -700));
@@ -66,7 +66,7 @@ void main() {
if (fail) throw StateError('refresh failed');
return schedulesReply(longScheduleList(30));
});
await pumpSchedules(tester, cupertino: false, gateway: gateway);
await pumpSchedules(tester, gateway: gateway);
final list = find.byKey(scheduleListKey);
await tester.drag(list, const Offset(0, -700));
@@ -104,7 +104,7 @@ void main() {
if (fail) throw StateError('refresh failed');
return schedulesReply([scheduleRecord(), pausedRecord()]);
});
await pumpSchedules(tester, cupertino: false, gateway: gateway);
await pumpSchedules(tester, gateway: gateway);
fail = true;
await tester.tap(find.byKey(scheduleRefreshKey));
@@ -14,7 +14,7 @@ void main() {
(type, fields) async =>
schedulesReply([scheduleRecord(), pausedRecord()]),
);
await pumpSchedules(tester, cupertino: false, gateway: gateway);
await pumpSchedules(tester, gateway: gateway);
await tester.enterText(find.byKey(scheduleSearchFieldKey), 'pipeline 7');
await tester.pump();
@@ -41,7 +41,7 @@ void main() {
(type, fields) async =>
schedulesReply([scheduleRecord(), pausedRecord()]),
);
await pumpSchedules(tester, cupertino: false, gateway: gateway);
await pumpSchedules(tester, gateway: gateway);
await tester.tap(
find.descendant(
@@ -65,12 +65,7 @@ void main() {
(type, fields) async => schedulesReply([record]),
);
final opened = <SavedSchedule>[];
await pumpSchedules(
tester,
cupertino: false,
gateway: gateway,
onOpen: opened.add,
);
await pumpSchedules(tester, gateway: gateway, onOpen: opened.add);
expect(opened, isEmpty);
expect(find.text('Add schedule'), findsNothing);
@@ -92,14 +87,14 @@ void main() {
final empty = FakeSchedulesGateway(
(type, fields) async => {'type': 'schedules'},
);
await pumpSchedules(tester, cupertino: false, gateway: empty);
await pumpSchedules(tester, gateway: empty);
expect(find.text('No schedules yet.'), findsOneWidget);
expect(find.byKey(scheduleRetryKey), findsNothing);
final unsupported = FakeSchedulesGateway(
(type, fields) async => {'type': 'runs'},
);
await pumpSchedules(tester, cupertino: false, gateway: unsupported);
await pumpSchedules(tester, gateway: unsupported);
expect(
find.textContaining('does not support saved schedules'),
findsOneWidget,
@@ -110,7 +105,7 @@ void main() {
final failed = FakeSchedulesGateway(
(type, fields) async => throw StateError('socket closed'),
);
await pumpSchedules(tester, cupertino: false, gateway: failed);
await pumpSchedules(tester, gateway: failed);
expect(find.textContaining('socket closed'), findsOneWidget);
expect(find.byKey(scheduleRetryKey), findsOneWidget);
expect(tester.takeException(), isNull);
@@ -122,7 +117,7 @@ void main() {
final gateway = FakeSchedulesGateway(
(type, fields) async => schedulesReply([pausedRecord()]),
);
await pumpSchedules(tester, cupertino: false, gateway: gateway);
await pumpSchedules(tester, gateway: gateway);
await tester.tap(
find.descendant(
@@ -147,12 +142,7 @@ void main() {
tester,
) async {
final gateway = ControlledSchedulesGateway();
await pumpSchedules(
tester,
cupertino: false,
gateway: gateway,
settle: false,
);
await pumpSchedules(tester, gateway: gateway, settle: false);
expect(find.byKey(scheduleRefreshKey), findsNothing);
await tester.pumpWidget(const SizedBox.shrink());
@@ -14,7 +14,6 @@ void main() {
'row', (tester) async {
await pumpSchedules(
tester,
cupertino: false,
size: const Size(1200, 800),
gateway: FakeSchedulesGateway(
(type, fields) async => schedulesReply([
@@ -378,37 +378,31 @@ void main() {
expect(find.text('socket closed'), findsNothing);
});
testWidgets('320px at 2x text stays usable on both native hosts', (
tester,
) async {
for (final cupertino in [false, true]) {
final gateway = SectionGateway(
(type, fields) async => schedulesReply([
sectionRecord(
name: 'A very long schedule name that must wrap without overflow',
prompt:
'A long prompt that also wraps instead of forcing a fixed row '
'height or a horizontal scroll.',
),
]),
);
await pumpScheduleSection(
tester,
gateway: gateway,
cupertino: cupertino,
dark: cupertino,
width: 320,
height: 844,
textScale: 2,
);
testWidgets('320px at 2x text stays usable', (tester) async {
final gateway = SectionGateway(
(type, fields) async => schedulesReply([
sectionRecord(
name: 'A very long schedule name that must wrap without overflow',
prompt:
'A long prompt that also wraps instead of forcing a fixed row '
'height or a horizontal scroll.',
),
]),
);
await pumpScheduleSection(
tester,
gateway: gateway,
width: 320,
height: 844,
textScale: 2,
);
expect(tester.takeException(), isNull);
expect(find.byKey(scheduleAddKey), findsOneWidget);
await _openMenu(tester, 8);
expect(find.byKey(scheduleRowEditKey(8)), findsOneWidget);
expect(find.byKey(scheduleRowToggleKey(8)), findsOneWidget);
expect(find.byKey(scheduleRowDeleteKey(8)), findsOneWidget);
expect(tester.takeException(), isNull);
}
expect(tester.takeException(), isNull);
expect(find.byKey(scheduleAddKey), findsOneWidget);
await _openMenu(tester, 8);
expect(find.byKey(scheduleRowEditKey(8)), findsOneWidget);
expect(find.byKey(scheduleRowToggleKey(8)), findsOneWidget);
expect(find.byKey(scheduleRowDeleteKey(8)), findsOneWidget);
expect(tester.takeException(), isNull);
});
}
@@ -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';
@@ -83,12 +82,7 @@ JsonMap sectionRecord({
},
};
Widget sectionApp(
Widget section, {
required bool cupertino,
bool dark = false,
double textScale = 1,
}) {
Widget sectionApp(Widget section, {bool dark = false, double textScale = 1}) {
Widget media(BuildContext context, Widget? app) => MediaQuery(
data: MediaQuery.of(
context,
@@ -98,16 +92,6 @@ Widget sectionApp(
final body = SafeArea(
child: ListView(children: [section, const SizedBox(height: 24)]),
);
if (cupertino) {
return CupertinoApp(
debugShowCheckedModeBanner: false,
theme: CupertinoThemeData(
brightness: dark ? Brightness.dark : Brightness.light,
),
builder: media,
home: CupertinoPageScaffold(child: body),
);
}
return MaterialApp(
debugShowCheckedModeBanner: false,
theme: ThemeData(brightness: dark ? Brightness.dark : Brightness.light),
@@ -119,7 +103,6 @@ Widget sectionApp(
Future<void> pumpScheduleSection(
WidgetTester tester, {
required SectionGateway gateway,
bool cupertino = false,
bool dark = false,
double width = 390,
double height = 844,
@@ -137,7 +120,7 @@ Future<void> pumpScheduleSection(
settingsStore: MemorySettingsStore(workspace: '/srv/research'),
);
await tester.pumpWidget(
sectionApp(section, cupertino: cupertino, dark: dark, textScale: textScale),
sectionApp(section, dark: dark, textScale: textScale),
);
await tester.pumpAndSettle();
}
@@ -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/core/api_gateway.dart';
@@ -68,23 +67,15 @@ JsonMap restrictedRunFixture() => {
'output_format': 'json',
};
Future<void> pumpAction(
WidgetTester tester,
Widget child, {
bool cupertino = false,
}) async {
Future<void> pumpAction(WidgetTester tester, Widget child) async {
tester.view.physicalSize = const Size(390, 1600);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.resetPhysicalSize);
addTearDown(tester.view.resetDevicePixelRatio);
await tester.pumpWidget(
cupertino
? CupertinoApp(
home: CupertinoPageScaffold(child: SafeArea(child: child)),
)
: MaterialApp(
home: Scaffold(body: SafeArea(child: child)),
),
MaterialApp(
home: Scaffold(body: SafeArea(child: child)),
),
);
await tester.pumpAndSettle();
}
@@ -225,38 +216,4 @@ void main() {
await openMenu(runFixture(pipelineId: null));
expect(find.text(scheduleRunActionLabel), findsNothing);
});
testWidgets('Cupertino uses the native action and fields', (tester) async {
final gateway = SaveGateway();
await pumpAction(
tester,
ScheduleRunAction(run: runFixture(), gateway: gateway),
cupertino: true,
);
final action = find.byKey(scheduleRunActionKey);
expect(
find.widgetWithText(CupertinoButton, scheduleRunActionLabel),
findsOne,
);
await tester.tap(action);
await tester.pumpAndSettle();
expect(gateway.calls, isEmpty);
expect(find.byKey(scheduleEditorSubmitKey), findsOneWidget);
expect(
tester
.widget<CupertinoTextField>(find.byKey(scheduleEditorVersionKey))
.controller
?.text,
'5',
);
expect(
tester
.widget<CupertinoTextField>(find.byKey(scheduleEditorWorkspaceKey))
.controller
?.text,
'/srv/run-workspace',
);
});
}