diff --git a/app/lib/features/settings/managed_connection_section.dart b/app/lib/features/settings/managed_connection_section.dart index 3bf7700f..6a6ad457 100644 --- a/app/lib/features/settings/managed_connection_section.dart +++ b/app/lib/features/settings/managed_connection_section.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -9,7 +8,6 @@ import 'settings_controller.dart'; import 'settings_group.dart'; import 'settings_row.dart'; import 'settings_sections.dart'; -import 'settings_theme.dart'; /// The short line under the managed connection's rows. const String managedConnectionHelp = @@ -33,7 +31,6 @@ class ManagedConnectionSection extends StatelessWidget { @override Widget build(BuildContext context) { - final cupertino = usesCupertinoControls(context); return SettingsGroup( title: 'Connection', leadingRows: true, @@ -52,24 +49,20 @@ class ManagedConnectionSection extends StatelessWidget { children: [ SettingsStatusRow(controller: controller), SettingsRow( - leading: Icon(cupertino ? CupertinoIcons.link : Icons.link), + leading: Icon(Icons.link), title: const Text('Current address'), subtitle: SelectableText('${client.endpoint ?? 'Not connected'}'), ), SettingsRow( action: true, enabled: client.endpoints.isNotEmpty, - leading: Icon( - cupertino ? CupertinoIcons.arrow_clockwise : Icons.refresh, - ), + leading: Icon(Icons.refresh), title: const Text('Reconnect'), onTap: () => unawaited(client.connectAny(client.endpoints)), ), SettingsRow( action: true, - leading: Icon( - cupertino ? CupertinoIcons.stop_circle : Icons.link_off, - ), + leading: Icon(Icons.link_off), title: const Text('Disconnect'), onTap: () => unawaited(client.disconnect()), ), diff --git a/app/lib/features/settings/quick_switch_preview.dart b/app/lib/features/settings/quick_switch_preview.dart index 0e54b8d2..2cc9cfff 100644 --- a/app/lib/features/settings/quick_switch_preview.dart +++ b/app/lib/features/settings/quick_switch_preview.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../ui/motion/quick_switch_animation.dart'; import '../chat/workspace/chat_workspace.dart'; @@ -51,7 +50,6 @@ class _QuickSwitchPreviewState extends State { @override Widget build(BuildContext context) { final reduced = MediaQuery.disableAnimationsOf(context); - final cupertino = usesCupertinoControls(context); return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ @@ -60,16 +58,11 @@ class _QuickSwitchPreviewState extends State { crossAxisAlignment: WrapCrossAlignment.center, children: [ Text('Preview', style: settingsTextStyle(context, title: true)), - cupertino - ? CupertinoButton( - onPressed: reduced ? null : _replay, - child: const Text('Replay animation'), - ) - : TextButton.icon( - onPressed: reduced ? null : _replay, - icon: const Icon(Icons.replay), - label: const Text('Replay animation'), - ), + TextButton.icon( + onPressed: reduced ? null : _replay, + icon: const Icon(Icons.replay), + label: const Text('Replay animation'), + ), ], ), Center( @@ -120,16 +113,10 @@ class _PreviewChat extends StatelessWidget { @override Widget build(BuildContext context) { - final cupertino = usesCupertinoControls(context); - final color = cupertino - ? (alternate ? CupertinoColors.systemTeal : CupertinoColors.systemBlue) - .resolveFrom(context) - : (alternate - ? Theme.of(context).colorScheme.tertiary - : Theme.of(context).colorScheme.primary); - final background = cupertino - ? CupertinoColors.secondarySystemGroupedBackground.resolveFrom(context) - : Theme.of(context).colorScheme.surfaceContainerHigh; + final color = alternate + ? Theme.of(context).colorScheme.tertiary + : Theme.of(context).colorScheme.primary; + final background = Theme.of(context).colorScheme.surfaceContainerHigh; return DecoratedBox( decoration: BoxDecoration( color: background, diff --git a/app/lib/features/settings/saved_server_editor.dart b/app/lib/features/settings/saved_server_editor.dart index e116cbe6..34c59871 100644 --- a/app/lib/features/settings/saved_server_editor.dart +++ b/app/lib/features/settings/saved_server_editor.dart @@ -1,9 +1,7 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../core/servers/machine_access.dart'; import '../../core/servers/server_catalog.dart'; -import '../../ui/adaptive/host.dart'; import '../../ui/adaptive/segmented_bar.dart'; import '../onboarding/discovery/discovered_server.dart'; import '../onboarding/discovery/discovery_panel.dart'; @@ -28,9 +26,7 @@ Future editSavedServer( discovery: discovery ?? platformServerDiscovery(), ); return Navigator.of(context).push( - usesCupertinoHost(context) - ? CupertinoPageRoute(builder: (_) => page) - : MaterialPageRoute(builder: (_) => page), + MaterialPageRoute(builder: (_) => page), ); } @@ -125,27 +121,6 @@ class _ServerEditorState extends State<_ServerEditor> { required String key, bool multiline = false, }) { - if (usesCupertinoHost(context)) { - return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text(label), - const SizedBox(height: 8), - CupertinoTextField( - key: Key(key), - controller: controller, - enabled: !_saving, - placeholder: multiline ? 'wss://server.example/connect' : 'Home', - minLines: multiline ? 3 : 1, - maxLines: multiline ? null : 1, - keyboardType: multiline - ? TextInputType.multiline - : TextInputType.text, - autocorrect: !multiline, - ), - ], - ); - } return TextField( key: Key(key), controller: controller, @@ -163,18 +138,12 @@ class _ServerEditorState extends State<_ServerEditor> { @override Widget build(BuildContext context) { - final cupertino = usesCupertinoHost(context); final title = widget.server == null ? 'Add server' : 'Edit server'; final saveLabel = _saving ? 'Saving server…' : 'Save server'; - final save = cupertino - ? CupertinoButton.filled( - onPressed: _saving ? null : _save, - child: Text(saveLabel), - ) - : FilledButton( - onPressed: _saving ? null : _save, - child: Text(saveLabel), - ); + final save = FilledButton( + onPressed: _saving ? null : _save, + child: Text(saveLabel), + ); final saved = _saved; if (saved != null && widget.authenticator != null) { final step = SafeArea( @@ -189,7 +158,7 @@ class _ServerEditorState extends State<_ServerEditor> { ], ), ); - return _scaffold(cupertino, 'Sign in to ${saved.name}', step); + return _scaffold('Sign in to ${saved.name}', step); } final body = SafeArea( child: ListView( @@ -232,9 +201,7 @@ class _ServerEditorState extends State<_ServerEditor> { child: Text( _error!, style: TextStyle( - color: cupertino - ? CupertinoColors.systemRed.resolveFrom(context) - : Theme.of(context).colorScheme.error, + color: Theme.of(context).colorScheme.error, ), ), ), @@ -244,17 +211,12 @@ class _ServerEditorState extends State<_ServerEditor> { ], ), ); - return PopScope(canPop: !_saving, child: _scaffold(cupertino, title, body)); + return PopScope(canPop: !_saving, child: _scaffold(title, body)); } - Widget _scaffold(bool cupertino, String title, Widget body) => cupertino - ? CupertinoPageScaffold( - navigationBar: SegmentedBar(cupertino: true, title: title), - child: body, - ) - : Scaffold( - extendBodyBehindAppBar: true, - appBar: SegmentedBar(cupertino: false, title: title), - body: body, - ); + Widget _scaffold(String title, Widget body) => Scaffold( + extendBodyBehindAppBar: true, + appBar: SegmentedBar(cupertino: false, title: title), + body: body, + ); } diff --git a/app/lib/features/settings/saved_server_row.dart b/app/lib/features/settings/saved_server_row.dart index e224f2b1..a753c4a9 100644 --- a/app/lib/features/settings/saved_server_row.dart +++ b/app/lib/features/settings/saved_server_row.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../core/servers/machine_access.dart'; @@ -64,69 +63,27 @@ class SavedServerRow extends StatelessWidget { : 'Unreachable: ${status!.detail}', }; - Future _cupertinoMenu(BuildContext context) async { - final action = await showCupertinoModalPopup( - context: context, - builder: (context) => CupertinoActionSheet( - title: Text(server.name), - actions: [ - for (final action in _actions) - CupertinoActionSheetAction( - isDestructiveAction: action == SavedServerAction.remove, - onPressed: () => Navigator.pop(context, action), - child: Text(_label(action)), - ), - ], - cancelButton: CupertinoActionSheetAction( - onPressed: () => Navigator.pop(context), - child: const Text('Cancel'), - ), - ), - ); - if (action != null) onAction(action); - } - @override Widget build(BuildContext context) { - final cupertino = usesCupertinoControls(context); - final Widget menu = cupertino - ? CupertinoButton( - key: savedServerMenuKey(server.id), - padding: EdgeInsets.zero, - onPressed: busy ? null : () => _cupertinoMenu(context), - child: Icon( - CupertinoIcons.ellipsis_circle, - semanticLabel: '${server.name} actions', - ), - ) - : PopupMenuButton( - key: savedServerMenuKey(server.id), - enabled: !busy, - tooltip: '${server.name} actions', - onSelected: onAction, - itemBuilder: (context) => >[ - for (final action in _actions) - PopupMenuItem(value: action, child: Text(_label(action))), - ], - ); + final Widget menu = PopupMenuButton( + key: savedServerMenuKey(server.id), + enabled: !busy, + tooltip: '${server.name} actions', + onSelected: onAction, + itemBuilder: (context) => >[ + for (final action in _actions) + PopupMenuItem(value: action, child: Text(_label(action))), + ], + ); final Widget mark = !allowSelection - ? Icon(cupertino ? CupertinoIcons.desktopcomputer : Icons.computer) + ? Icon(Icons.computer) : selected ? Icon( - cupertino - ? CupertinoIcons.checkmark_circle_fill - : Icons.check_circle, + Icons.check_circle, semanticLabel: 'Selected', - color: cupertino - ? CupertinoTheme.of(context).primaryColor - : Theme.of(context).colorScheme.primary, + color: Theme.of(context).colorScheme.primary, ) - : Icon( - cupertino ? CupertinoIcons.circle : Icons.radio_button_unchecked, - color: cupertino - ? CupertinoColors.tertiaryLabel.resolveFrom(context) - : null, - ); + : Icon(Icons.radio_button_unchecked); final needsPassword = status?.needsPassword ?? false; final state = _stateText; return SettingsRow( diff --git a/app/lib/features/settings/saved_server_sign_in_step.dart b/app/lib/features/settings/saved_server_sign_in_step.dart index 01aabe36..2cfe9be6 100644 --- a/app/lib/features/settings/saved_server_sign_in_step.dart +++ b/app/lib/features/settings/saved_server_sign_in_step.dart @@ -1,9 +1,7 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../core/servers/machine_access.dart'; import '../../core/servers/server_catalog.dart'; -import '../../ui/adaptive/host.dart'; /// What the editor does once a machine is saved: ask it whether this device /// may use it, then either sign in with its own password or explain why it @@ -92,21 +90,16 @@ class _SavedServerSignInStepState extends State { @override Widget build(BuildContext context) { - final cupertino = usesCupertinoHost(context); final name = widget.server.name; - final errorColor = cupertino - ? CupertinoColors.systemRed.resolveFrom(context) - : Theme.of(context).colorScheme.error; + final errorColor = Theme.of(context).colorScheme.error; final result = _result; if (result == null) { return Row( children: [ - cupertino - ? const CupertinoActivityIndicator() - : const SizedBox.square( - dimension: 16, - child: CircularProgressIndicator(strokeWidth: 2), - ), + const SizedBox.square( + dimension: 16, + child: CircularProgressIndicator(strokeWidth: 2), + ), const SizedBox(width: 12), Expanded( child: Text('Saved. Checking whether $name needs a sign-in…'), @@ -114,51 +107,29 @@ class _SavedServerSignInStepState extends State { ], ); } - final later = cupertino - ? CupertinoButton( - key: const Key('server-sign-in-later'), - onPressed: _busy ? null : widget.onDone, - child: const Text('Later'), - ) - : TextButton( - key: const Key('server-sign-in-later'), - onPressed: _busy ? null : widget.onDone, - child: const Text('Later'), - ); + final later = TextButton( + key: const Key('server-sign-in-later'), + onPressed: _busy ? null : widget.onDone, + child: const Text('Later'), + ); if (result.needsPassword) { - final field = cupertino - ? CupertinoTextField( - key: const Key('server-profile-password'), - controller: _password, - obscureText: true, - autofocus: true, - enabled: !_busy, - placeholder: 'Password', - onSubmitted: (_) => _signIn(), - ) - : TextField( - key: const Key('server-profile-password'), - controller: _password, - obscureText: true, - autofocus: true, - enabled: !_busy, - decoration: const InputDecoration( - labelText: 'Password', - border: OutlineInputBorder(), - ), - onSubmitted: (_) => _signIn(), - ); - final signIn = cupertino - ? CupertinoButton.filled( - key: const Key('server-profile-sign-in'), - onPressed: _busy ? null : _signIn, - child: Text(_busy ? 'Signing in…' : 'Sign in'), - ) - : FilledButton( - key: const Key('server-profile-sign-in'), - onPressed: _busy ? null : _signIn, - child: Text(_busy ? 'Signing in…' : 'Sign in'), - ); + final field = TextField( + key: const Key('server-profile-password'), + controller: _password, + obscureText: true, + autofocus: true, + enabled: !_busy, + decoration: const InputDecoration( + labelText: 'Password', + border: OutlineInputBorder(), + ), + onSubmitted: (_) => _signIn(), + ); + final signIn = FilledButton( + key: const Key('server-profile-sign-in'), + onPressed: _busy ? null : _signIn, + child: Text(_busy ? 'Signing in…' : 'Sign in'), + ); return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ @@ -182,17 +153,11 @@ class _SavedServerSignInStepState extends State { ], ); } - final retry = cupertino - ? CupertinoButton.filled( - key: const Key('server-profile-retry'), - onPressed: _busy ? null : _probe, - child: const Text('Try again'), - ) - : FilledButton( - key: const Key('server-profile-retry'), - onPressed: _busy ? null : _probe, - child: const Text('Try again'), - ); + final retry = FilledButton( + key: const Key('server-profile-retry'), + onPressed: _busy ? null : _probe, + child: const Text('Try again'), + ); return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ diff --git a/app/lib/features/settings/saved_servers_section.dart b/app/lib/features/settings/saved_servers_section.dart index a6d96b6b..84de5d06 100644 --- a/app/lib/features/settings/saved_servers_section.dart +++ b/app/lib/features/settings/saved_servers_section.dart @@ -1,12 +1,10 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import '../../core/servers/chat/machine_sign_in_dialog.dart'; import '../../core/servers/server_catalog.dart'; -import '../../ui/adaptive/host.dart'; import 'saved_server_editor.dart'; import 'saved_server_row.dart'; import 'server_connections.dart'; @@ -47,47 +45,25 @@ class SavedServersSection extends StatelessWidget { } Future _remove(BuildContext context, SavedServer server) async { - final cupertino = usesCupertinoHost(context); - final confirmed = cupertino - ? await showCupertinoDialog( - context: context, - builder: (context) => CupertinoAlertDialog( - title: Text('Remove ${server.name}?'), - content: const Text( - 'This removes the saved configuration, not data on the server.', - ), - actions: [ - CupertinoDialogAction( - onPressed: () => Navigator.pop(context, false), - child: const Text('Cancel'), - ), - CupertinoDialogAction( - isDestructiveAction: true, - onPressed: () => Navigator.pop(context, true), - child: const Text('Remove'), - ), - ], - ), - ) - : await showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text('Remove ${server.name}?'), - content: const Text( - 'This removes the saved configuration, not data on the server.', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(context, false), - child: const Text('Cancel'), - ), - TextButton( - onPressed: () => Navigator.pop(context, true), - child: const Text('Remove'), - ), - ], - ), - ); + final confirmed = await showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text('Remove ${server.name}?'), + content: const Text( + 'This removes the saved configuration, not data on the server.', + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, false), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () => Navigator.pop(context, true), + child: const Text('Remove'), + ), + ], + ), + ); if (confirmed == true) await connections.remove(server.id); } @@ -116,7 +92,6 @@ class SavedServersSection extends StatelessWidget { Widget build(BuildContext context) => ListenableBuilder( listenable: Listenable.merge([connections, ?connections.authenticator]), builder: (context, _) { - final cupertino = usesCupertinoHost(context); final error = connections.error; final allowSelection = allowPrimarySelection ?? !kIsWeb; return SettingsGroup( @@ -150,7 +125,7 @@ class SavedServersSection extends StatelessWidget { SettingsRow( action: true, enabled: !connections.busy, - leading: Icon(cupertino ? CupertinoIcons.add : Icons.add), + leading: Icon(Icons.add), title: const Text('Add server'), onTap: () => unawaited(_edit(context)), ), diff --git a/app/lib/features/settings/settings_android_download_section.dart b/app/lib/features/settings/settings_android_download_section.dart index 49c2d9a1..78471e02 100644 --- a/app/lib/features/settings/settings_android_download_section.dart +++ b/app/lib/features/settings/settings_android_download_section.dart @@ -1,9 +1,7 @@ import 'dart:convert'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../../ui/adaptive/host.dart'; import '../artifacts/ui/artifact_external_open.dart'; import '../artifacts/ui/artifact_viewer_fetch.dart'; import '../updates/app_updates.dart'; @@ -71,14 +69,9 @@ class _SettingsAndroidDownloadSectionState @override Widget build(BuildContext context) { - final cupertino = usesCupertinoHost(context); - final muted = cupertino - ? CupertinoTheme.of(context).textTheme.textStyle.copyWith( - color: CupertinoColors.secondaryLabel.resolveFrom(context), - ) - : Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ); + final muted = Theme.of(context).textTheme.bodySmall?.copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + ); final update = _update; if (_loading) { return Text('Checking for the Android app…', style: muted); @@ -89,18 +82,12 @@ class _SettingsAndroidDownloadSectionState style: muted, ); } - final button = cupertino - ? CupertinoButton.filled( - key: const Key('settings-android-download'), - onPressed: () => _download(update), - child: const Text('Download APK'), - ) - : FilledButton.icon( - key: const Key('settings-android-download'), - onPressed: () => _download(update), - icon: const Icon(Icons.download), - label: const Text('Download APK'), - ); + final button = FilledButton.icon( + key: const Key('settings-android-download'), + onPressed: () => _download(update), + icon: const Icon(Icons.download), + label: const Text('Download APK'), + ); return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/app/lib/features/settings/settings_animation_section.dart b/app/lib/features/settings/settings_animation_section.dart index 28c5fc4f..abda089d 100644 --- a/app/lib/features/settings/settings_animation_section.dart +++ b/app/lib/features/settings/settings_animation_section.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../ui/motion/animation_speed.dart'; import '../../ui/motion/quick_switch_animation.dart'; @@ -20,7 +19,6 @@ class SettingsAnimationSection extends StatelessWidget { Widget build(BuildContext context) => ListenableBuilder( listenable: controller, builder: (context, _) { - final cupertino = usesCupertinoControls(context); final speed = controller.speed; final label = '${speed.toStringAsFixed(1)}×'; final reset = speed == 1 ? null : () => unawaited(controller.reset()); @@ -49,39 +47,22 @@ class SettingsAnimationSection extends StatelessWidget { crossAxisAlignment: WrapCrossAlignment.center, children: [ Text(label, style: settingsTextStyle(context, title: true)), - cupertino - ? CupertinoButton( - onPressed: reset, - child: const Text('Reset'), - ) - : TextButton( - onPressed: reset, - child: const Text('Reset'), - ), + TextButton(onPressed: reset, child: const Text('Reset')), ], ), Semantics( label: 'Animation speed', - child: cupertino - ? CupertinoSlider( - value: speed, - min: minAnimationSpeed, - max: maxAnimationSpeed, - divisions: 15, - onChanged: controller.setSpeed, - onChangeEnd: (_) => unawaited(controller.save()), - ) - : Slider( - value: speed, - min: minAnimationSpeed, - max: maxAnimationSpeed, - divisions: 15, - label: label, - semanticFormatterCallback: (value) => - '${value.toStringAsFixed(1)} times', - onChanged: controller.setSpeed, - onChangeEnd: (_) => unawaited(controller.save()), - ), + child: Slider( + value: speed, + min: minAnimationSpeed, + max: maxAnimationSpeed, + divisions: 15, + label: label, + semanticFormatterCallback: (value) => + '${value.toStringAsFixed(1)} times', + onChanged: controller.setSpeed, + onChangeEnd: (_) => unawaited(controller.save()), + ), ), const Wrap( alignment: WrapAlignment.spaceBetween, diff --git a/app/lib/features/settings/settings_controls.dart b/app/lib/features/settings/settings_controls.dart index 6d87ddfb..6473d59a 100644 --- a/app/lib/features/settings/settings_controls.dart +++ b/app/lib/features/settings/settings_controls.dart @@ -1,15 +1,13 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'settings_layout.dart'; -import 'settings_theme.dart'; export 'settings_theme.dart'; -/// A native text field with a label and one supporting line. Both platforms lay -/// the label out as wrapping text above the field; Material uses an outlined -/// [TextField] and iOS a [CupertinoTextField]. The label is a compact secondary -/// line (like the web field label) while the section title carries the weight. +/// A native text field with a label and one supporting line. The label is laid +/// out as wrapping text above the field; Material uses an outlined +/// [TextField]. The label is a compact secondary line (like the web field +/// label) while the section title carries the weight. /// Labels and helper/error copy are never line-capped, so large text cannot /// truncate them. No font sizes, heights or colours are fixed here. class SettingsTextField extends StatelessWidget { @@ -44,58 +42,11 @@ class SettingsTextField extends StatelessWidget { final labelWidget = ExcludeSemantics( child: Text( label, - style: usesCupertinoControls(context) - ? settingsTextStyle(context, secondary: true) - : theme.textTheme.labelMedium?.copyWith( - color: theme.colorScheme.onSurfaceVariant, - ), + style: theme.textTheme.labelMedium?.copyWith( + color: theme.colorScheme.onSurfaceVariant, + ), ), ); - if (!usesCupertinoControls(context)) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - labelWidget, - const SizedBox(height: settingsFieldGap), - Semantics( - label: label, - child: TextField( - controller: controller, - onChanged: onChanged, - keyboardType: TextInputType.url, - minLines: 1, - maxLines: maxLines, - autocorrect: false, - enableSuggestions: false, - textInputAction: TextInputAction.done, - decoration: InputDecoration( - hintText: placeholder, - // `helperText`/`errorText` single-line-ellipsize unless capped - // by `helperMaxLines`/`errorMaxLines`. Widgets wrap with no line - // cap, so the full instructions stay readable at 2x. - helper: hasError - ? null - : Text( - helper, - style: theme.textTheme.bodySmall?.copyWith( - color: theme.colorScheme.onSurfaceVariant, - ), - ), - error: hasError - ? Text( - error, - style: theme.textTheme.bodySmall?.copyWith( - color: theme.colorScheme.error, - ), - ) - : null, - border: const OutlineInputBorder(), - ), - ), - ), - ], - ); - } return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -103,26 +54,38 @@ class SettingsTextField extends StatelessWidget { const SizedBox(height: settingsFieldGap), Semantics( label: label, - child: CupertinoTextField( + child: TextField( controller: controller, onChanged: onChanged, - placeholder: placeholder, keyboardType: TextInputType.url, minLines: 1, maxLines: maxLines, autocorrect: false, enableSuggestions: false, - clearButtonMode: OverlayVisibilityMode.editing, textInputAction: TextInputAction.done, - ), - ), - const SizedBox(height: settingsFieldGap), - Text( - hasError ? error : helper, - style: settingsTextStyle( - context, - error: hasError, - secondary: !hasError, + decoration: InputDecoration( + hintText: placeholder, + // `helperText`/`errorText` single-line-ellipsize unless capped + // by `helperMaxLines`/`errorMaxLines`. Widgets wrap with no line + // cap, so the full instructions stay readable at 2x. + helper: hasError + ? null + : Text( + helper, + style: theme.textTheme.bodySmall?.copyWith( + color: theme.colorScheme.onSurfaceVariant, + ), + ), + error: hasError + ? Text( + error, + style: theme.textTheme.bodySmall?.copyWith( + color: theme.colorScheme.error, + ), + ) + : null, + border: const OutlineInputBorder(), + ), ), ), ], @@ -152,24 +115,6 @@ class SettingsActions extends StatelessWidget { @override Widget build(BuildContext context) { - if (usesCupertinoControls(context)) { - return Wrap( - spacing: settingsControlGap, - runSpacing: settingsControlGap, - children: [ - CupertinoButton.filled( - key: primaryKey, - onPressed: onPrimary, - child: Text(primaryLabel), - ), - CupertinoButton( - key: secondaryKey, - onPressed: onSecondary, - child: Text(secondaryLabel), - ), - ], - ); - } return Wrap( spacing: settingsControlGap, runSpacing: settingsControlGap, diff --git a/app/lib/features/settings/settings_custom_font_actions.dart b/app/lib/features/settings/settings_custom_font_actions.dart index a6eb8d91..e6448ca9 100644 --- a/app/lib/features/settings/settings_custom_font_actions.dart +++ b/app/lib/features/settings/settings_custom_font_actions.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../ui/theme/app_font_controller.dart'; @@ -6,7 +5,6 @@ import '../../ui/theme/custom_fonts/custom_font.dart'; import '../../ui/theme/custom_fonts/custom_font_draft.dart'; import '../../ui/theme/custom_fonts/font_file_picker.dart'; import 'settings_custom_font_dialogs.dart'; -import 'settings_theme.dart'; const addCustomFontText = 'Add font…'; const addingCustomFontText = 'Adding…'; @@ -104,45 +102,8 @@ class CustomFontMenu extends StatelessWidget { } } - Future _cupertinoSheet(BuildContext context) async { - final action = await showCupertinoModalPopup<_CustomFontAction>( - context: context, - builder: (context) => CupertinoActionSheet( - title: Text(font.name), - actions: [ - CupertinoActionSheetAction( - onPressed: () => Navigator.pop(context, _CustomFontAction.rename), - child: const Text(renameCustomFontText), - ), - CupertinoActionSheetAction( - isDestructiveAction: true, - onPressed: () => Navigator.pop(context, _CustomFontAction.remove), - child: const Text(removeCustomFontText), - ), - ], - cancelButton: CupertinoActionSheetAction( - onPressed: () => Navigator.pop(context), - child: const Text('Cancel'), - ), - ), - ); - if (action != null && context.mounted) await _run(context, action); - } - @override Widget build(BuildContext context) { - if (usesCupertinoControls(context)) { - return Semantics( - label: customFontActionsTooltip, - button: true, - excludeSemantics: true, - child: CupertinoButton( - padding: EdgeInsets.zero, - onPressed: () => _cupertinoSheet(context), - child: const Icon(CupertinoIcons.ellipsis_circle), - ), - ); - } return PopupMenuButton<_CustomFontAction>( tooltip: customFontActionsTooltip, onSelected: (action) => _run(context, action), diff --git a/app/lib/features/settings/settings_custom_font_dialogs.dart b/app/lib/features/settings/settings_custom_font_dialogs.dart index f0d58d5d..964834ec 100644 --- a/app/lib/features/settings/settings_custom_font_dialogs.dart +++ b/app/lib/features/settings/settings_custom_font_dialogs.dart @@ -1,8 +1,6 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../ui/theme/custom_fonts/custom_font_draft.dart'; -import 'settings_theme.dart'; const customFontNameLabel = 'Name'; const addCustomFontTitle = 'Add font'; @@ -24,9 +22,7 @@ Future showFontNameDialog( confirm: confirm, detail: detail, ); - return usesCupertinoControls(context) - ? showCupertinoDialog(context: context, builder: (_) => dialog) - : showDialog(context: context, builder: (_) => dialog); + return showDialog(context: context, builder: (_) => dialog); } class _FontNameDialog extends StatefulWidget { @@ -69,25 +65,16 @@ class _FontNameDialogState extends State<_FontNameDialog> { @override Widget build(BuildContext context) { - final cupertino = usesCupertinoControls(context); - final field = cupertino - ? CupertinoTextField( - controller: _name, - autofocus: true, - placeholder: customFontNameLabel, - maxLength: CustomFontLimits.maxNameLength, - onSubmitted: (_) => _submit(), - ) - : TextField( - controller: _name, - autofocus: true, - maxLength: CustomFontLimits.maxNameLength, - decoration: InputDecoration( - labelText: customFontNameLabel, - errorText: _problem, - ), - onSubmitted: (_) => _submit(), - ); + final field = TextField( + controller: _name, + autofocus: true, + maxLength: CustomFontLimits.maxNameLength, + decoration: InputDecoration( + labelText: customFontNameLabel, + errorText: _problem, + ), + onSubmitted: (_) => _submit(), + ); final content = Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch, @@ -97,30 +84,8 @@ class _FontNameDialogState extends State<_FontNameDialog> { const SizedBox(height: 12), ], field, - if (cupertino && _problem != null) - Text(_problem!, style: TextStyle(color: settingsErrorColor(context))), ], ); - if (cupertino) { - return CupertinoAlertDialog( - title: Text(widget.title), - content: Padding( - padding: const EdgeInsets.only(top: 8), - child: content, - ), - actions: [ - CupertinoDialogAction( - onPressed: () => Navigator.pop(context), - child: const Text('Cancel'), - ), - CupertinoDialogAction( - isDefaultAction: true, - onPressed: _submit, - child: Text(widget.confirm), - ), - ], - ); - } return AlertDialog( title: Text(widget.title), content: SingleChildScrollView(child: content), @@ -139,42 +104,23 @@ class _FontNameDialogState extends State<_FontNameDialog> { Future confirmRemoveFont(BuildContext context, String name) async { final title = Text('Remove $name?'); const body = Text('Its files are deleted from this device.'); - final confirmed = usesCupertinoControls(context) - ? await showCupertinoDialog( - context: context, - builder: (context) => CupertinoAlertDialog( - title: title, - content: body, - actions: [ - CupertinoDialogAction( - onPressed: () => Navigator.pop(context, false), - child: const Text('Cancel'), - ), - CupertinoDialogAction( - isDestructiveAction: true, - onPressed: () => Navigator.pop(context, true), - child: const Text('Remove'), - ), - ], - ), - ) - : await showDialog( - context: context, - builder: (context) => AlertDialog( - title: title, - content: body, - actions: [ - TextButton( - onPressed: () => Navigator.pop(context, false), - child: const Text('Cancel'), - ), - TextButton( - onPressed: () => Navigator.pop(context, true), - child: const Text('Remove'), - ), - ], - ), - ); + final confirmed = await showDialog( + context: context, + builder: (context) => AlertDialog( + title: title, + content: body, + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, false), + child: const Text('Cancel'), + ), + TextButton( + onPressed: () => Navigator.pop(context, true), + child: const Text('Remove'), + ), + ], + ), + ); return confirmed ?? false; } @@ -183,31 +129,16 @@ Future showFontProblem( BuildContext context, String title, String message, -) => usesCupertinoControls(context) - ? showCupertinoDialog( - context: context, - builder: (context) => CupertinoAlertDialog( - title: Text(title), - content: Text(message), - actions: [ - CupertinoDialogAction( - isDefaultAction: true, - onPressed: () => Navigator.pop(context), - child: const Text('OK'), - ), - ], - ), - ) - : showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text(title), - content: Text(message), - actions: [ - TextButton( - onPressed: () => Navigator.pop(context), - child: const Text('OK'), - ), - ], - ), - ); +) => showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(title), + content: Text(message), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: const Text('OK'), + ), + ], + ), +); diff --git a/app/lib/features/settings/settings_device_delivery_section.dart b/app/lib/features/settings/settings_device_delivery_section.dart index c02763fe..f5511c17 100644 --- a/app/lib/features/settings/settings_device_delivery_section.dart +++ b/app/lib/features/settings/settings_device_delivery_section.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../notification_service/notification_service_bridge.dart'; @@ -84,7 +83,6 @@ class _SettingsDeviceDeliverySectionState ); Widget _body(BuildContext context) { - final cupertino = usesCupertinoControls(context); final status = _controller.status; final enabled = status?.enabled ?? false; final onChanged = status == null || _controller.busy @@ -105,20 +103,12 @@ class _SettingsDeviceDeliverySectionState ], ), children: [ - if (cupertino) - CupertinoListTile( - key: DeviceDeliveryKeys.toggle, - title: const Text(deviceDeliverySwitchLabel), - trailing: CupertinoSwitch(value: enabled, onChanged: onChanged), - onTap: onChanged == null ? null : () => onChanged(!enabled), - ) - else - SwitchListTile( - key: DeviceDeliveryKeys.toggle, - title: const Text(deviceDeliverySwitchLabel), - value: enabled, - onChanged: onChanged, - ), + SwitchListTile( + key: DeviceDeliveryKeys.toggle, + title: const Text(deviceDeliverySwitchLabel), + value: enabled, + onChanged: onChanged, + ), SettingsRow( key: DeviceDeliveryKeys.status, title: const Text('Status'), diff --git a/app/lib/features/settings/settings_font_section.dart b/app/lib/features/settings/settings_font_section.dart index 44e501e0..d692daf3 100644 --- a/app/lib/features/settings/settings_font_section.dart +++ b/app/lib/features/settings/settings_font_section.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../ui/theme/app_font.dart'; @@ -30,7 +29,7 @@ const ValueKey settingsAddFontKey = ValueKey( /// The device's interface font: one row per option, each named in its own /// face, the user's added fonts below the bundled ones, then "Add font…". -/// Material rows are radio tiles, Cupertino rows carry the checkmark. +/// Material rows are radio tiles. /// A choice is stored locally and applies as soon as its files load. class SettingsFontSection extends StatefulWidget { const SettingsFontSection({ @@ -98,7 +97,6 @@ class _SettingsFontSectionState extends State { Widget _group(BuildContext context) { final controller = widget.controller; - final cupertino = usesCupertinoControls(context); final options = [...AppFont.values, ...controller.customFonts]; final group = SettingsGroup( title: fontSectionTitle, @@ -114,10 +112,7 @@ class _SettingsFontSectionState extends State { ], ), children: [ - for (final font in options) - cupertino - ? _cupertinoRow(context, font) - : _materialRow(context, font), + for (final font in options) _materialRow(context, font), // Its own node: a bare list tile would lend its label and tap to the // section around it. Semantics( @@ -126,7 +121,7 @@ class _SettingsFontSectionState extends State { key: settingsAddFontKey, action: true, enabled: !_adding, - leading: Icon(cupertino ? CupertinoIcons.add : Icons.add), + leading: Icon(Icons.add), title: const Text(addCustomFontText), subtitle: _adding ? const Text(addingCustomFontText) : null, onTap: () => unawaited(_add()), @@ -134,7 +129,6 @@ class _SettingsFontSectionState extends State { ), ], ); - if (cupertino) return group; return RadioGroup( groupValue: controller.selected, onChanged: (font) { @@ -166,39 +160,6 @@ class _SettingsFontSectionState extends State { ); } - Widget _cupertinoRow(BuildContext context, FontChoice font) { - final check = widget.controller.selected == font - ? Icon( - CupertinoIcons.check_mark, - color: CupertinoTheme.of(context).primaryColor, - ) - : null; - // One node per option, announced as selected. - final row = Semantics( - container: true, - selected: check != null, - child: SettingsRow( - key: settingsFontKey(font), - title: _name(context, font), - subtitle: _status(context, font), - trailing: check, - onTap: () => unawaited(widget.controller.select(font)), - ), - ); - if (font is! CustomFont) return row; - // Beside the row, not in it: the list tile merges its children's - // semantics (see [_materialRow]). - return Row( - children: [ - Expanded(child: row), - Padding( - padding: const EdgeInsetsDirectional.only(end: 12), - child: CustomFontMenu(fonts: widget.controller, font: font), - ), - ], - ); - } - /// The option's name in its own face once its regular weight has loaded; /// the system face until then (and always for the system option). Widget _name(BuildContext context, FontChoice font) { @@ -225,10 +186,9 @@ class _SettingsFontSectionState extends State { } } -/// The platform's own interface family (Roboto, or the Cupertino system -/// face), independent of the font the theme currently applies. -String? _systemFamily(BuildContext context) => usesCupertinoControls(context) - ? const CupertinoTextThemeData().textStyle.fontFamily - : Typography.material2021( - platform: Theme.of(context).platform, - ).black.bodyLarge?.fontFamily; +/// The platform's own interface family (Roboto), independent of the font the +/// theme currently applies. +String? _systemFamily(BuildContext context) => + Typography.material2021( + platform: Theme.of(context).platform, + ).black.bodyLarge?.fontFamily; diff --git a/app/lib/features/settings/settings_group.dart b/app/lib/features/settings/settings_group.dart index e17ba071..59116157 100644 --- a/app/lib/features/settings/settings_group.dart +++ b/app/lib/features/settings/settings_group.dart @@ -1,18 +1,12 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../../ui/theme/app_theme.dart'; import 'settings_layout.dart'; -import 'settings_theme.dart'; /// One grouped Settings section: a short header, a flat rounded group of rows /// and an optional one-line footer. /// /// Material draws the header in the theme's primary `titleSmall` and the rows /// on a flat `surfaceContainer` with hairline dividers (no elevation). -/// Cupertino uses the stock inset-grouped [CupertinoListSection], whose rows -/// sit on `secondarySystemGroupedBackground` over the page's -/// `systemGroupedBackground`. class SettingsGroup extends StatelessWidget { const SettingsGroup({ super.key, @@ -28,26 +22,14 @@ class SettingsGroup extends StatelessWidget { /// A short line (or two) under the group: helper copy, a warning. final Widget? footer; - /// Whether the rows carry leading icons: Cupertino then starts its - /// dividers at the titles (the stock inset), otherwise at the row text. + /// Whether the rows carry leading icons: kept for callers, the Material + /// group does not depend on it. final bool leadingRows; @override Widget build(BuildContext context) { final title = this.title; final footer = this.footer; - if (usesCupertinoControls(context)) { - return CupertinoListSection.insetGrouped( - margin: EdgeInsets.zero, - backgroundColor: AppColors.groupedBackground, - header: title == null - ? null - : Text(title, style: settingsHeaderStyle(context)), - footer: footer == null ? null : _footer(context, footer), - additionalDividerMargin: leadingRows ? null : 6, - children: children.isEmpty ? null : children, - ); - } final theme = Theme.of(context); return Column( crossAxisAlignment: CrossAxisAlignment.stretch, @@ -96,17 +78,10 @@ class SettingsGroup extends StatelessWidget { } Widget _footer(BuildContext context, Widget footer) { - final cupertino = usesCupertinoControls(context); - // Cupertino: the footnote size the stock plain list section uses for - // its own header and footer. - final style = cupertino - ? settingsTextStyle(context, secondary: true).copyWith(fontSize: 13) - : Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ); + final style = Theme.of(context).textTheme.bodySmall?.copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + ); final text = DefaultTextStyle.merge(style: style, child: footer); - // The Cupertino section pads its own footer. - if (cupertino) return text; return Padding( padding: const EdgeInsetsDirectional.fromSTEB( settingsRowInset, @@ -121,9 +96,6 @@ class SettingsGroup extends StatelessWidget { /// A group header's text style. TextStyle settingsHeaderStyle(BuildContext context) { - if (usesCupertinoControls(context)) { - return settingsTextStyle(context).copyWith(fontWeight: FontWeight.w600); - } final theme = Theme.of(context); return (theme.textTheme.titleSmall ?? const TextStyle()).copyWith( color: theme.colorScheme.primary, @@ -142,7 +114,7 @@ class SettingsGroupItem extends StatelessWidget { width: double.infinity, child: Padding( padding: EdgeInsetsDirectional.symmetric( - horizontal: usesCupertinoControls(context) ? 20 : settingsRowInset, + horizontal: settingsRowInset, vertical: 12, ), child: child, diff --git a/app/lib/features/settings/settings_layout.dart b/app/lib/features/settings/settings_layout.dart index 2ac7d7d9..6e5cecd8 100644 --- a/app/lib/features/settings/settings_layout.dart +++ b/app/lib/features/settings/settings_layout.dart @@ -1,8 +1,8 @@ /// The one place the Settings screen keeps its necessary layout constraints. /// /// Everything else (control heights, font sizes, colours, button padding) comes -/// from the active Material or Cupertino theme, so text scaling and platform -/// defaults are never overridden here. +/// from the active Material theme, so text scaling and platform defaults are +/// never overridden here. /// /// The page is a column of grouped sections. It starts at the top bar's own /// side inset, so on a wide window the groups line up under the title pill diff --git a/app/lib/features/settings/settings_ntfy_section.dart b/app/lib/features/settings/settings_ntfy_section.dart index 90526546..e1ae4580 100644 --- a/app/lib/features/settings/settings_ntfy_section.dart +++ b/app/lib/features/settings/settings_ntfy_section.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../core/api_gateway.dart'; @@ -82,7 +81,6 @@ class _SettingsNtfySectionState extends State { ); Widget _body(BuildContext context) { - final cupertino = usesCupertinoControls(context); final values = _controller.values; final enabled = widget.connected && _controller.enabled; final status = !widget.connected @@ -97,7 +95,6 @@ class _SettingsNtfySectionState extends State { if (hasNtfySwitch) ntfyEnabledSetting, ]) _tile( - cupertino, setting, values?[setting.key] ?? false, enabled ? (value) => _controller.toggle(setting.key, value) : null, @@ -123,16 +120,10 @@ class _SettingsNtfySectionState extends State { if (_controller.error.isNotEmpty && retry) Align( alignment: AlignmentDirectional.centerStart, - child: cupertino - ? CupertinoButton( - padding: EdgeInsets.zero, - onPressed: _controller.load, - child: const Text('Retry'), - ) - : TextButton( - onPressed: _controller.load, - child: const Text('Retry'), - ), + child: TextButton( + onPressed: _controller.load, + child: const Text('Retry'), + ), ), ], ), @@ -141,22 +132,10 @@ class _SettingsNtfySectionState extends State { } Widget _tile( - bool cupertino, NtfySetting setting, bool value, ValueChanged? onChanged, ) { - if (cupertino) { - return CupertinoListTile( - key: ntfySettingKey(setting.key), - title: Text(setting.label), - subtitle: setting.subtitle == null ? null : Text(setting.subtitle!), - // iOS settings rows toggle with a switch; an unchecked checkbox is - // nearly invisible on the grouped row. - trailing: CupertinoSwitch(value: value, onChanged: onChanged), - onTap: onChanged == null ? null : () => onChanged(!value), - ); - } return CheckboxListTile( key: ntfySettingKey(setting.key), title: Text(setting.label), diff --git a/app/test/features/settings/saved_server_editor_save_test.dart b/app/test/features/settings/saved_server_editor_save_test.dart index 02453f6f..d7e10c96 100644 --- a/app/test/features/settings/saved_server_editor_save_test.dart +++ b/app/test/features/settings/saved_server_editor_save_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/servers/server_catalog.dart'; @@ -26,20 +25,13 @@ class _ControlledStore extends MemoryServerCatalogStore { Future _openEditor( WidgetTester tester, - ServerConnections connections, - bool cupertino, { + ServerConnections connections, { bool edit = false, }) async { final body = SingleChildScrollView( child: SavedServersSection(connections: connections), ); - await tester.pumpWidget( - cupertino - ? CupertinoApp( - home: CupertinoPageScaffold(child: SafeArea(child: body)), - ) - : MaterialApp(home: Scaffold(body: body)), - ); + await tester.pumpWidget(MaterialApp(home: Scaffold(body: body))); if (edit) await openSavedServerMenu(tester); await tester.tap(find.text(edit ? 'Edit Home' : 'Add server')); await tester.pumpAndSettle(); @@ -56,125 +48,114 @@ Future _openEditor( } void main() { - for (final cupertino in [false, true]) { - testWidgets('Back cancels an unsaved draft ($cupertino)', (tester) async { + testWidgets('Back cancels an unsaved draft', (tester) async { + final store = _ControlledStore(); + final connections = ServerConnections( + store: store, + onSelected: (_) async => fail('Cancel must not select a server'), + ); + addTearDown(connections.dispose); + await _openEditor(tester, connections); + await tester.binding.handlePopRoute(); + await tester.pumpAndSettle(); + expect(find.byKey(const Key('server-profile-name')), findsNothing); + expect(store.writes, isEmpty); + expect(connections.catalog.servers, isEmpty); + }); + + testWidgets('failed edit keeps draft and blocks duplicate save', ( + tester, + ) async { + final original = SavedServer.validated( + id: 'home', + name: 'Home', + endpoints: ['wss://home.test/connect'], + ); + final store = _ControlledStore( + catalog: ServerCatalog(servers: [original], selectedId: original.id), + )..pending = Completer(); + final activations = []; + final connections = ServerConnections( + store: store, + onSelected: (server) async => activations.add(server), + ); + addTearDown(connections.dispose); + await connections.load(); + await _openEditor(tester, connections, edit: true); + await tester.tap(find.text('Save server')); + await tester.pump(); + + expect(find.text('Saving server…'), findsOneWidget); + final button = find.widgetWithText(FilledButton, 'Saving server…'); + expect(tester.widget(button).onPressed, isNull); + await tester.tap(find.text('Saving server…')); + await tester.binding.handlePopRoute(); + await tester.pump(); + expect(find.byKey(const Key('server-profile-name')), findsOneWidget); + expect(store.writes, hasLength(1)); + expect(connections.catalog.active?.name, 'Home'); + expect(activations, isEmpty); + + store.pending!.complete(false); + await tester.pumpAndSettle(); + expect(find.textContaining('could not be saved'), findsOneWidget); + final name = tester.widget( + find.descendant( + of: find.byKey(const Key('server-profile-name')), + matching: find.byType(EditableText), + ), + ); + final addresses = tester.widget( + find.descendant( + of: find.byKey(const Key('server-profile-addresses')), + matching: find.byType(EditableText), + ), + ); + expect(name.controller.text, 'My home'); + expect(addresses.controller.text, contains('ws://192.168.1.2:8083')); + expect(connections.catalog.active?.name, 'Home'); + + store.pending = null; + await tester.ensureVisible(find.text('Save server')); + await tester.tap(find.text('Save server')); + await tester.pumpAndSettle(); + expect(find.byKey(const Key('server-profile-name')), findsNothing); + expect(connections.catalog.active?.name, 'My home'); + expect(store.catalog?.active?.endpoints, hasLength(2)); + expect(store.writes, hasLength(2)); + expect(activations.single?.id, original.id); + expect(tester.takeException(), isNull); + }); + + testWidgets( + 'activation failure retry does not duplicate new profile', + (tester) async { final store = _ControlledStore(); + var attempts = 0; final connections = ServerConnections( store: store, - onSelected: (_) async => fail('Cancel must not select a server'), + onSelected: (_) async { + if (++attempts == 1) throw StateError('Connection unavailable'); + }, ); addTearDown(connections.dispose); - await _openEditor(tester, connections, cupertino); - await tester.binding.handlePopRoute(); + await connections.load(); + await _openEditor(tester, connections); + await tester.tap(find.text('Save server')); await tester.pumpAndSettle(); + expect(find.textContaining('Connection unavailable'), findsOneWidget); + expect(find.byKey(const Key('server-profile-name')), findsOneWidget); + expect(store.catalog?.servers, hasLength(1)); + final savedId = store.catalog!.servers.single.id; + + await tester.ensureVisible(find.text('Save server')); + await tester.tap(find.text('Save server')); + await tester.pumpAndSettle(); + expect(attempts, 2); + expect(store.catalog?.servers, hasLength(1)); + expect(store.catalog?.servers.single.id, savedId); expect(find.byKey(const Key('server-profile-name')), findsNothing); - expect(store.writes, isEmpty); - expect(connections.catalog.servers, isEmpty); - }); - - testWidgets( - 'failed edit keeps draft and blocks duplicate save ($cupertino)', - (tester) async { - final original = SavedServer.validated( - id: 'home', - name: 'Home', - endpoints: ['wss://home.test/connect'], - ); - final store = _ControlledStore( - catalog: ServerCatalog(servers: [original], selectedId: original.id), - )..pending = Completer(); - final activations = []; - final connections = ServerConnections( - store: store, - onSelected: (server) async => activations.add(server), - ); - addTearDown(connections.dispose); - await connections.load(); - await _openEditor(tester, connections, cupertino, edit: true); - await tester.tap(find.text('Save server')); - await tester.pump(); - - expect(find.text('Saving server…'), findsOneWidget); - final button = find.widgetWithText( - cupertino ? CupertinoButton : FilledButton, - 'Saving server…', - ); - expect( - cupertino - ? tester.widget(button).onPressed - : tester.widget(button).onPressed, - isNull, - ); - await tester.tap(find.text('Saving server…')); - await tester.binding.handlePopRoute(); - await tester.pump(); - expect(find.byKey(const Key('server-profile-name')), findsOneWidget); - expect(store.writes, hasLength(1)); - expect(connections.catalog.active?.name, 'Home'); - expect(activations, isEmpty); - - store.pending!.complete(false); - await tester.pumpAndSettle(); - expect(find.textContaining('could not be saved'), findsOneWidget); - final name = tester.widget( - find.descendant( - of: find.byKey(const Key('server-profile-name')), - matching: find.byType(EditableText), - ), - ); - final addresses = tester.widget( - find.descendant( - of: find.byKey(const Key('server-profile-addresses')), - matching: find.byType(EditableText), - ), - ); - expect(name.controller.text, 'My home'); - expect(addresses.controller.text, contains('ws://192.168.1.2:8083')); - expect(connections.catalog.active?.name, 'Home'); - - store.pending = null; - await tester.ensureVisible(find.text('Save server')); - await tester.tap(find.text('Save server')); - await tester.pumpAndSettle(); - expect(find.byKey(const Key('server-profile-name')), findsNothing); - expect(connections.catalog.active?.name, 'My home'); - expect(store.catalog?.active?.endpoints, hasLength(2)); - expect(store.writes, hasLength(2)); - expect(activations.single?.id, original.id); - expect(tester.takeException(), isNull); - }, - ); - - testWidgets( - 'activation failure retry does not duplicate new profile ($cupertino)', - (tester) async { - final store = _ControlledStore(); - var attempts = 0; - final connections = ServerConnections( - store: store, - onSelected: (_) async { - if (++attempts == 1) throw StateError('Connection unavailable'); - }, - ); - addTearDown(connections.dispose); - await connections.load(); - await _openEditor(tester, connections, cupertino); - await tester.tap(find.text('Save server')); - await tester.pumpAndSettle(); - expect(find.textContaining('Connection unavailable'), findsOneWidget); - expect(find.byKey(const Key('server-profile-name')), findsOneWidget); - expect(store.catalog?.servers, hasLength(1)); - final savedId = store.catalog!.servers.single.id; - - await tester.ensureVisible(find.text('Save server')); - await tester.tap(find.text('Save server')); - await tester.pumpAndSettle(); - expect(attempts, 2); - expect(store.catalog?.servers, hasLength(1)); - expect(store.catalog?.servers.single.id, savedId); - expect(find.byKey(const Key('server-profile-name')), findsNothing); - expect(tester.takeException(), isNull); - }, - ); - } + expect(tester.takeException(), isNull); + }, + ); } diff --git a/app/test/features/settings/saved_servers_test.dart b/app/test/features/settings/saved_servers_test.dart index 9d7302e9..47323853 100644 --- a/app/test/features/settings/saved_servers_test.dart +++ b/app/test/features/settings/saved_servers_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/core/servers/server_catalog.dart'; @@ -108,95 +107,79 @@ void main() { }, ); - for (final cupertino in [false, true]) { - testWidgets('add, edit and select ordered server aliases ($cupertino)', ( - tester, - ) async { - final calls = []; - final connections = ServerConnections( - store: MemoryServerCatalogStore(), - onSelected: (s) async => calls.add(s?.id), - ); - addTearDown(connections.dispose); - await connections.load(); - final body = SingleChildScrollView( - child: SavedServersSection(connections: connections), - ); - await tester.pumpWidget( - cupertino - ? CupertinoApp( - home: CupertinoPageScaffold(child: SafeArea(child: body)), - ) - : MaterialApp(home: Scaffold(body: body)), - ); - await tester.tap(find.text('Add server')); - await tester.pumpAndSettle(); - await tester.enterText( - find.byKey(const Key('server-profile-name')), - 'Home', - ); - await tester.enterText( - find.byKey(const Key('server-profile-addresses')), - 'wss://tail.example/connect\nws://192.168.1.2:8083/connect', - ); - await revealSave(tester); - await tester.tap(find.text('Save server')); - await tester.pumpAndSettle(); - expect(connections.catalog.active?.name, 'Home'); - expect(connections.catalog.active?.endpoints, [ - 'wss://tail.example/connect', - 'ws://192.168.1.2:8083/connect', - ]); - expect( - find.text('Backup address: ws://192.168.1.2:8083/connect'), - findsOneWidget, - ); - await openSavedServerMenu(tester); - await tester.tap(find.text('Edit Home')); - await tester.pumpAndSettle(); - await tester.enterText( - find.byKey(const Key('server-profile-name')), - 'My home', - ); - await revealSave(tester); - await tester.tap(find.text('Save server')); - await tester.pumpAndSettle(); - expect(connections.catalog.active?.name, 'My home'); - expect(calls, hasLength(2)); - expect(calls.first, calls.last); - expect(tester.takeException(), isNull); - }); + testWidgets('add, edit and select ordered server aliases', (tester) async { + final calls = []; + final connections = ServerConnections( + store: MemoryServerCatalogStore(), + onSelected: (s) async => calls.add(s?.id), + ); + addTearDown(connections.dispose); + await connections.load(); + final body = SingleChildScrollView( + child: SavedServersSection(connections: connections), + ); + await tester.pumpWidget(MaterialApp(home: Scaffold(body: body))); + await tester.tap(find.text('Add server')); + await tester.pumpAndSettle(); + await tester.enterText( + find.byKey(const Key('server-profile-name')), + 'Home', + ); + await tester.enterText( + find.byKey(const Key('server-profile-addresses')), + 'wss://tail.example/connect\nws://192.168.1.2:8083/connect', + ); + await revealSave(tester); + await tester.tap(find.text('Save server')); + await tester.pumpAndSettle(); + expect(connections.catalog.active?.name, 'Home'); + expect(connections.catalog.active?.endpoints, [ + 'wss://tail.example/connect', + 'ws://192.168.1.2:8083/connect', + ]); + expect( + find.text('Backup address: ws://192.168.1.2:8083/connect'), + findsOneWidget, + ); + await openSavedServerMenu(tester); + await tester.tap(find.text('Edit Home')); + await tester.pumpAndSettle(); + await tester.enterText( + find.byKey(const Key('server-profile-name')), + 'My home', + ); + await revealSave(tester); + await tester.tap(find.text('Save server')); + await tester.pumpAndSettle(); + expect(connections.catalog.active?.name, 'My home'); + expect(calls, hasLength(2)); + expect(calls.first, calls.last); + expect(tester.takeException(), isNull); + }); - testWidgets('invalid server addresses stay in editor ($cupertino)', ( - tester, - ) async { - final connections = ServerConnections( - store: MemoryServerCatalogStore(), - onSelected: (_) async {}, - ); - addTearDown(connections.dispose); - final body = SavedServersSection(connections: connections); - await tester.pumpWidget( - cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: body)) - : MaterialApp(home: Scaffold(body: body)), - ); - await tester.tap(find.text('Add server')); - await tester.pumpAndSettle(); - await tester.enterText( - find.byKey(const Key('server-profile-name')), - 'Home', - ); - await tester.enterText( - find.byKey(const Key('server-profile-addresses')), - 'not-a-url', - ); - await revealSave(tester); - await tester.tap(find.text('Save server')); - await tester.pumpAndSettle(); - expect(find.byKey(const Key('server-profile-addresses')), findsOneWidget); - expect(connections.catalog.servers, isEmpty); - expect(find.textContaining('valid URL'), findsOneWidget); - }); - } + testWidgets('invalid server addresses stay in editor', (tester) async { + final connections = ServerConnections( + store: MemoryServerCatalogStore(), + onSelected: (_) async {}, + ); + addTearDown(connections.dispose); + final body = SavedServersSection(connections: connections); + await tester.pumpWidget(MaterialApp(home: Scaffold(body: body))); + await tester.tap(find.text('Add server')); + await tester.pumpAndSettle(); + await tester.enterText( + find.byKey(const Key('server-profile-name')), + 'Home', + ); + await tester.enterText( + find.byKey(const Key('server-profile-addresses')), + 'not-a-url', + ); + await revealSave(tester); + await tester.tap(find.text('Save server')); + await tester.pumpAndSettle(); + expect(find.byKey(const Key('server-profile-addresses')), findsOneWidget); + expect(connections.catalog.servers, isEmpty); + expect(find.textContaining('valid URL'), findsOneWidget); + }); } diff --git a/app/test/features/settings/settings_animation_section_test.dart b/app/test/features/settings/settings_animation_section_test.dart index 8f093a7b..31c138e3 100644 --- a/app/test/features/settings/settings_animation_section_test.dart +++ b/app/test/features/settings/settings_animation_section_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -18,47 +17,31 @@ class _Store implements AnimationSpeedStore { void main() { tearDown(() => timeDilation = 1); - for (final cupertino in [false, true]) { - testWidgets( - 'native slider updates global speed and Reset restores normal ($cupertino)', - (tester) async { - final store = _Store(); - final controller = AnimationSpeedController(store: store); - final section = SettingsAnimationSection(controller: controller); - await tester.pumpWidget( - cupertino - ? CupertinoApp( - home: CupertinoPageScaffold( - child: SingleChildScrollView(child: section), - ), - ) - : MaterialApp( - home: Scaffold(body: SingleChildScrollView(child: section)), - ), - ); - if (cupertino) { - final slider = tester.widget( - find.byType(CupertinoSlider), - ); - slider.onChanged!(1.8); - slider.onChangeEnd!(1.8); - } else { - final slider = tester.widget(find.byType(Slider)); - slider.onChanged!(1.8); - slider.onChangeEnd!(1.8); - } - await tester.pump(); - expect(find.text('1.8×'), findsWidgets); - expect(timeDilation, closeTo(1 / 1.8, 0.001)); - expect(store.saved, 1.8); - await tester.tap(find.text('Reset')); - await tester.pump(); - expect(controller.speed, 1); - expect(timeDilation, 1); - expect(store.saved, 1); - expect(tester.takeException(), isNull); - controller.dispose(); - }, - ); - } + testWidgets( + 'layout slider updates global speed and Reset restores normal', + (tester) async { + final store = _Store(); + final controller = AnimationSpeedController(store: store); + final section = SettingsAnimationSection(controller: controller); + await tester.pumpWidget( + MaterialApp( + home: Scaffold(body: SingleChildScrollView(child: section)), + ), + ); + final slider = tester.widget(find.byType(Slider)); + slider.onChanged!(1.8); + slider.onChangeEnd!(1.8); + await tester.pump(); + expect(find.text('1.8×'), findsWidgets); + expect(timeDilation, closeTo(1 / 1.8, 0.001)); + expect(store.saved, 1.8); + await tester.tap(find.text('Reset')); + await tester.pump(); + expect(controller.speed, 1); + expect(timeDilation, 1); + expect(store.saved, 1); + expect(tester.takeException(), isNull); + controller.dispose(); + }, + ); } diff --git a/app/test/features/settings/settings_custom_font_test.dart b/app/test/features/settings/settings_custom_font_test.dart index efd5ebed..7e0e3db3 100644 --- a/app/test/features/settings/settings_custom_font_test.dart +++ b/app/test/features/settings/settings_custom_font_test.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/settings/settings_custom_font_actions.dart'; @@ -12,7 +11,6 @@ import 'package:pipelines_app/features/settings/settings_row.dart'; import 'package:pipelines_app/ui/theme/app_font.dart'; import 'package:pipelines_app/ui/theme/app_font_controller.dart'; import 'package:pipelines_app/ui/theme/app_font_store.dart'; -import 'package:pipelines_app/ui/theme/custom_fonts/custom_font.dart'; import 'package:pipelines_app/ui/theme/custom_fonts/custom_font_draft.dart'; import 'package:pipelines_app/ui/theme/custom_fonts/custom_font_library.dart'; import 'package:pipelines_app/ui/theme/custom_fonts/font_bytes_store.dart'; @@ -42,7 +40,6 @@ class _Harness { Future _pump( WidgetTester tester, _Harness harness, { - bool cupertino = false, FontFilePicker? pick, }) async { final section = SingleChildScrollView( @@ -51,11 +48,7 @@ Future _pump( pickFiles: pick ?? harness.pick, ), ); - await tester.pumpWidget( - cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: section)) - : MaterialApp(home: Scaffold(body: section)), - ); + await tester.pumpWidget(MaterialApp(home: Scaffold(body: section))); await tester.pumpAndSettle(); } @@ -243,35 +236,4 @@ void main() { final row = tester.widget(find.byKey(settingsAddFontKey)); expect(row.enabled, isTrue); }); - - testWidgets('Cupertino: an added font has the checkmark and options', ( - tester, - ) async { - final harness = _Harness()..next = [regular]; - await _pump(tester, harness, cupertino: true); - await tester.tap(find.text(addCustomFontText)); - await tester.pumpAndSettle(); - await tester.tap(find.text('Add')); - await tester.pumpAndSettle(); - - final CustomFont font = harness.fonts.customFonts.single; - final row = find.byKey(settingsFontKey(font)); - expect( - find.descendant( - of: row, - matching: find.byIcon(CupertinoIcons.check_mark), - ), - findsOneWidget, - ); - // The options button is its own control beside the row. - expect(find.bySemanticsLabel(customFontActionsTooltip), findsOneWidget); - await tester.tap(find.byIcon(CupertinoIcons.ellipsis_circle)); - await tester.pumpAndSettle(); - await tester.tap(find.text(removeCustomFontText)); - await tester.pumpAndSettle(); - await tester.tap(find.widgetWithText(CupertinoDialogAction, 'Remove')); - await tester.pumpAndSettle(); - expect(harness.fonts.customFonts, isEmpty); - expect(harness.fonts.selected, AppFont.system); - }); } diff --git a/app/test/features/settings/settings_device_delivery_section_test.dart b/app/test/features/settings/settings_device_delivery_section_test.dart index 9b583ba8..b6d9003d 100644 --- a/app/test/features/settings/settings_device_delivery_section_test.dart +++ b/app/test/features/settings/settings_device_delivery_section_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/notification_service/notification_service_bridge.dart'; @@ -8,7 +7,6 @@ import '../notification_service/fake_notification_service.dart'; Widget _host( NotificationServiceBridge bridge, { - required bool cupertino, Future Function()? requestPermission, }) { final body = SingleChildScrollView( @@ -17,59 +15,44 @@ Widget _host( requestNotificationPermission: requestPermission, ), ); - return cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: body)) - : MaterialApp(home: Scaffold(body: body)); + return MaterialApp(home: Scaffold(body: body)); } -bool _switchValue(WidgetTester tester, {required bool cupertino}) { +bool _switchValue(WidgetTester tester) { final tile = find.byKey(DeviceDeliveryKeys.toggle); - if (cupertino) { - return tester - .widget( - find.descendant(of: tile, matching: find.byType(CupertinoSwitch)), - ) - .value; - } return tester.widget(tile).value; } void main() { - for (final cupertino in [false, true]) { - final style = cupertino ? 'Cupertino' : 'Material'; + testWidgets('shows the switch, status and ntfy note', (tester) async { + final service = FakeNotificationService(); + await tester.pumpWidget(_host(service)); + await tester.pumpAndSettle(); + expect(find.text(deviceDeliverySwitchLabel), findsOneWidget); + expect(_switchValue(tester), isTrue); + expect(find.text('Connected'), findsOneWidget); + expect(find.text(deviceDeliveryNote), findsOneWidget); + expect(find.text(deviceDeliveryBatteryLabel), findsOneWidget); + expect(find.byKey(DeviceDeliveryKeys.permission), findsNothing); + }); - testWidgets('$style shows the switch, status and ntfy note', ( - tester, - ) async { - final service = FakeNotificationService(); - await tester.pumpWidget(_host(service, cupertino: cupertino)); - await tester.pumpAndSettle(); - expect(find.text(deviceDeliverySwitchLabel), findsOneWidget); - expect(_switchValue(tester, cupertino: cupertino), isTrue); - expect(find.text('Connected'), findsOneWidget); - expect(find.text(deviceDeliveryNote), findsOneWidget); - expect(find.text(deviceDeliveryBatteryLabel), findsOneWidget); - expect(find.byKey(DeviceDeliveryKeys.permission), findsNothing); - }); - - testWidgets('$style switching off stops delivery', (tester) async { - final service = FakeNotificationService(); - await tester.pumpWidget(_host(service, cupertino: cupertino)); - await tester.pumpAndSettle(); - await tester.tap(find.byKey(DeviceDeliveryKeys.toggle)); - await tester.pumpAndSettle(); - expect(service.calls.last.$1, 'setEnabled'); - expect(service.calls.last.$2, {'enabled': false}); - expect(_switchValue(tester, cupertino: cupertino), isFalse); - expect(find.text('Off'), findsOneWidget); - // The grants only matter while delivery is on. - expect(find.text(deviceDeliveryBatteryLabel), findsNothing); - }); - } + testWidgets('switching off stops delivery', (tester) async { + final service = FakeNotificationService(); + await tester.pumpWidget(_host(service)); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(DeviceDeliveryKeys.toggle)); + await tester.pumpAndSettle(); + expect(service.calls.last.$1, 'setEnabled'); + expect(service.calls.last.$2, {'enabled': false}); + expect(_switchValue(tester), isFalse); + expect(find.text('Off'), findsOneWidget); + // The grants only matter while delivery is on. + expect(find.text(deviceDeliveryBatteryLabel), findsNothing); + }); testWidgets('live status pushed by the service is shown', (tester) async { final service = FakeNotificationService(); - await tester.pumpWidget(_host(service, cupertino: false)); + await tester.pumpWidget(_host(service)); await tester.pumpAndSettle(); service.push(service.copy(state: DeliveryState.reconnecting)); await tester.pumpAndSettle(); @@ -80,7 +63,7 @@ void main() { tester, ) async { final service = FakeNotificationService(); - await tester.pumpWidget(_host(service, cupertino: false)); + await tester.pumpWidget(_host(service)); await tester.pumpAndSettle(); await tester.tap(find.text(deviceDeliveryBatteryLabel)); await tester.pumpAndSettle(); @@ -103,7 +86,6 @@ void main() { await tester.pumpWidget( _host( service, - cupertino: false, requestPermission: () async { asked++; service.current = service.copy(notificationsAllowed: true); @@ -128,7 +110,7 @@ void main() { notificationsAllowed: false, ); await tester.pumpWidget( - _host(service, cupertino: false, requestPermission: () async => asked++), + _host(service, requestPermission: () async => asked++), ); await tester.pumpAndSettle(); await tester.tap(find.byKey(DeviceDeliveryKeys.toggle)); @@ -139,7 +121,7 @@ void main() { }); testWidgets('a failing platform is reported, not hidden', (tester) async { - await tester.pumpWidget(_host(_FailingService(), cupertino: false)); + await tester.pumpWidget(_host(_FailingService())); await tester.pumpAndSettle(); expect(find.byKey(DeviceDeliveryKeys.error), findsOneWidget); }); diff --git a/app/test/features/settings/settings_font_section_test.dart b/app/test/features/settings/settings_font_section_test.dart index eeb4cfd2..c1191800 100644 --- a/app/test/features/settings/settings_font_section_test.dart +++ b/app/test/features/settings/settings_font_section_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/features/settings/settings_font_section.dart'; @@ -29,19 +28,11 @@ class _Harness { ); } -Future _pump( - WidgetTester tester, - _Harness harness, { - bool cupertino = false, -}) async { +Future _pump(WidgetTester tester, _Harness harness) async { final section = SingleChildScrollView( child: SettingsFontSection(controller: harness.fonts), ); - await tester.pumpWidget( - cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: section)) - : MaterialApp(home: Scaffold(body: section)), - ); + await tester.pumpWidget(MaterialApp(home: Scaffold(body: section))); await tester.pumpAndSettle(); } @@ -102,28 +93,6 @@ void main() { expect(harness.fonts.family, 'Source Sans 3'); }); - testWidgets('Cupertino: the chosen row carries the checkmark', ( - tester, - ) async { - final harness = _Harness(); - await _pump(tester, harness, cupertino: true); - - expect(find.byType(RadioListTile), findsNothing); - expect(_familyOf(tester, AppFont.system), 'CupertinoSystemText'); - Finder check(AppFont font) => find.descendant( - of: find.byKey(settingsFontKey(font)), - matching: find.byIcon(CupertinoIcons.check_mark), - ); - expect(check(AppFont.system), findsOneWidget); - - await tester.tap(find.text('Inter')); - await tester.pumpAndSettle(); - expect(check(AppFont.system), findsNothing); - expect(check(AppFont.inter), findsOneWidget); - expect(harness.store.id, AppFont.inter.id); - expect(harness.fonts.family, 'Inter'); - }); - testWidgets('a failed save is said under the group', (tester) async { final harness = _Harness(); harness.store.failSaves = true; diff --git a/app/test/features/settings/settings_layout_test.dart b/app/test/features/settings/settings_layout_test.dart index 36c0889c..ef76d053 100644 --- a/app/test/features/settings/settings_layout_test.dart +++ b/app/test/features/settings/settings_layout_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/core/servers/server_catalog.dart'; @@ -15,7 +14,6 @@ import 'package:pipelines_app/features/settings/settings_layout.dart'; import 'package:pipelines_app/features/settings/settings_screen.dart'; import 'package:pipelines_app/features/settings/settings_store.dart'; import 'package:pipelines_app/features/settings/settings_trust_warning.dart'; -import 'package:pipelines_app/ui/theme/app_theme.dart'; import 'fake_channel.dart'; import 'settings_topic_test_helper.dart'; @@ -94,29 +92,6 @@ void main() { ); }); - testWidgets('Cupertino uses inset-grouped sections on the grouped page', ( - tester, - ) async { - await _pump(tester, cupertino: true); - - expect(find.byType(Card), findsNothing); - expect(find.byType(CupertinoListSection), findsWidgets); - for (final section in tester.widgetList( - find.byType(CupertinoListSection), - )) { - expect(section.type, CupertinoListSectionType.insetGrouped); - } - final context = tester.element(find.byType(SettingsGroup).first); - expect( - find.byWidgetPredicate( - (widget) => - widget is ColoredBox && - widget.color == AppColors.groupedBackground.resolveFrom(context), - ), - findsWidgets, - ); - }); - testWidgets('the notification tile is the section\'s only title', ( tester, ) async { @@ -131,77 +106,54 @@ void main() { expect(find.text('Connection').last, findsOneWidget); }); - testWidgets('Cupertino keeps the compact secondary field label', ( - tester, - ) async { - await _pump(tester, cupertino: true); - - final label = tester.widget(find.text('Server URL')); - final context = tester.element(find.text('Server URL')); - expect( - label.style?.color, - CupertinoColors.secondaryLabel.resolveFrom(context), + testWidgets('server rows show which server is selected', (tester) async { + final connections = ServerConnections( + store: MemoryServerCatalogStore( + catalog: ServerCatalog( + servers: [ + SavedServer.validated( + id: 'Home', + name: 'Home', + endpoints: const ['wss://home.test/connect'], + ), + SavedServer.validated( + id: 'Work', + name: 'Work', + endpoints: const ['wss://work.test/connect'], + ), + ], + selectedId: 'Home', + ), + ), + onSelected: (_) async {}, ); - expect(find.byType(CupertinoTextField), findsNWidgets(2)); + addTearDown(connections.dispose); + await connections.load(); + final body = SingleChildScrollView( + child: SavedServersSection(connections: connections), + ); + await tester.pumpWidget(MaterialApp(home: Scaffold(body: body))); + + expect(find.byType(SavedServerRow), findsNWidgets(2)); + expect(find.text('Pipelines and runs server'), findsOneWidget); + expect( + find.byWidgetPredicate( + (widget) => widget is Icon && widget.semanticLabel == 'Selected', + ), + findsOneWidget, + ); + expect(find.text('Address: wss://work.test/connect'), findsOneWidget); + expect(find.byKey(savedServerMenuKey('Home')), findsOneWidget); + expect(find.text('Add server'), findsOneWidget); + // Tapping another server's row uses it. + await tester.tap(find.text('Work')); + await tester.pumpAndSettle(); + expect(connections.catalog.active?.id, 'Work'); }); - - for (final cupertino in [false, true]) { - testWidgets('server rows show which server is selected ($cupertino)', ( - tester, - ) async { - final connections = ServerConnections( - store: MemoryServerCatalogStore( - catalog: ServerCatalog( - servers: [ - SavedServer.validated( - id: 'Home', - name: 'Home', - endpoints: const ['wss://home.test/connect'], - ), - SavedServer.validated( - id: 'Work', - name: 'Work', - endpoints: const ['wss://work.test/connect'], - ), - ], - selectedId: 'Home', - ), - ), - onSelected: (_) async {}, - ); - addTearDown(connections.dispose); - await connections.load(); - final body = SingleChildScrollView( - child: SavedServersSection(connections: connections), - ); - await tester.pumpWidget( - cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: body)) - : MaterialApp(home: Scaffold(body: body)), - ); - - expect(find.byType(SavedServerRow), findsNWidgets(2)); - expect(find.text('Pipelines and runs server'), findsOneWidget); - expect( - find.byWidgetPredicate( - (widget) => widget is Icon && widget.semanticLabel == 'Selected', - ), - findsOneWidget, - ); - expect(find.text('Address: wss://work.test/connect'), findsOneWidget); - expect(find.byKey(savedServerMenuKey('Home')), findsOneWidget); - expect(find.text('Add server'), findsOneWidget); - // Tapping another server's row uses it. - await tester.tap(find.text('Work')); - await tester.pumpAndSettle(); - expect(connections.catalog.active?.id, 'Work'); - }); - } } Future _pump( WidgetTester tester, { - bool cupertino = false, NotificationController? notifications, Size size = const Size(800, 1600), double topPadding = 0, @@ -224,15 +176,10 @@ Future _pump( child: child!, ); await tester.pumpWidget( - cupertino - ? CupertinoApp( - builder: padded, - home: CupertinoPageScaffold(child: screen), - ) - : MaterialApp( - builder: padded, - home: Scaffold(body: screen), - ), + MaterialApp( + builder: padded, + home: Scaffold(body: screen), + ), ); await tester.pump(); await tester.pump(); diff --git a/app/test/features/settings/settings_ntfy_section_test.dart b/app/test/features/settings/settings_ntfy_section_test.dart index c73f4b89..0b06850a 100644 --- a/app/test/features/settings/settings_ntfy_section_test.dart +++ b/app/test/features/settings/settings_ntfy_section_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'; @@ -33,120 +32,96 @@ JsonMap _reply(bool run, bool needs, bool reply) => { }, }; -Widget _host(ApiGateway gateway, {required bool cupertino}) { +Widget _host(ApiGateway gateway) { final body = SingleChildScrollView( child: SettingsNtfySection(gateway: gateway, connected: true), ); - return cupertino - ? CupertinoApp(home: CupertinoPageScaffold(child: body)) - : MaterialApp(home: Scaffold(body: body)); + return MaterialApp(home: Scaffold(body: body)); } -bool _checked(WidgetTester tester, String key, {required bool cupertino}) { +bool _checked(WidgetTester tester, String key) { final tile = find.byKey(ntfySettingKey(key)); - if (cupertino) { - return tester - .widget( - find.descendant(of: tile, matching: find.byType(CupertinoSwitch)), - ) - .value; - } return tester.widget(tile).value!; } void main() { - for (final cupertino in [false, true]) { - final style = cupertino ? 'Cupertino' : 'Material'; + testWidgets('loads the stored values', (tester) async { + final gateway = _Gateway((_, _) => _reply(true, false, true)); + await tester.pumpWidget(_host(gateway)); + await tester.pumpAndSettle(); + expect(gateway.calls.single.$1, 'notification_settings'); + expect(find.text('Notify when any run ends'), findsOneWidget); + expect( + find.text('Otherwise only runs started with Notify me'), + findsOneWidget, + ); + expect(find.text('Chat needs your answer or approval'), findsOneWidget); + expect(find.text('Chat reply finished'), findsOneWidget); + expect(find.text(ntfySectionSubtitle), findsOneWidget); + expect(_checked(tester, 'run_finished'), isTrue); + expect(_checked(tester, 'chat_needs_you'), isFalse); + expect(_checked(tester, 'chat_reply_finished'), isTrue); + }); - testWidgets('$style loads the stored values', (tester) async { - final gateway = _Gateway((_, _) => _reply(true, false, true)); - await tester.pumpWidget(_host(gateway, cupertino: cupertino)); - await tester.pumpAndSettle(); - expect(gateway.calls.single.$1, 'notification_settings'); - expect(find.text('Notify when any run ends'), findsOneWidget); - expect( - find.text('Otherwise only runs started with Notify me'), - findsOneWidget, - ); - expect(find.text('Chat needs your answer or approval'), findsOneWidget); - expect(find.text('Chat reply finished'), findsOneWidget); - expect(find.text(ntfySectionSubtitle), findsOneWidget); - expect(_checked(tester, 'run_finished', cupertino: cupertino), isTrue); - expect(_checked(tester, 'chat_needs_you', cupertino: cupertino), isFalse); - expect( - _checked(tester, 'chat_reply_finished', cupertino: cupertino), - isTrue, - ); - }); + testWidgets('shows the server default: only marked runs', (tester) async { + // The server's defaults: run ends notify only for "Notify me" runs. + final gateway = _Gateway((_, _) => _reply(false, true, false)); + await tester.pumpWidget(_host(gateway)); + await tester.pumpAndSettle(); + expect(_checked(tester, 'run_finished'), isFalse); + expect(_checked(tester, 'chat_needs_you'), isTrue); + expect(_checked(tester, 'chat_reply_finished'), isFalse); + }); - testWidgets('$style shows the server default: only marked runs', ( - tester, - ) async { - // The server's defaults: run ends notify only for "Notify me" runs. - final gateway = _Gateway((_, _) => _reply(false, true, false)); - await tester.pumpWidget(_host(gateway, cupertino: cupertino)); - await tester.pumpAndSettle(); - expect(_checked(tester, 'run_finished', cupertino: cupertino), isFalse); - expect(_checked(tester, 'chat_needs_you', cupertino: cupertino), isTrue); - expect( - _checked(tester, 'chat_reply_finished', cupertino: cupertino), - isFalse, - ); + testWidgets('toggling writes only that setting', (tester) async { + final gateway = _Gateway((type, fields) { + if (type == 'set_notification_settings') { + return _reply(true, true, true); + } + return _reply(true, true, false); }); + await tester.pumpWidget(_host(gateway)); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(ntfySettingKey('chat_reply_finished'))); + await tester.pumpAndSettle(); + expect(gateway.calls, hasLength(2)); + expect(gateway.calls.last.$1, 'set_notification_settings'); + expect(gateway.calls.last.$2, { + 'notification_settings': {'chat_reply_finished': true}, + }); + expect(_checked(tester, 'chat_reply_finished'), isTrue); + expect(find.byKey(ntfyErrorKey), findsNothing); + }); - testWidgets('$style toggling writes only that setting', (tester) async { - final gateway = _Gateway((type, fields) { - if (type == 'set_notification_settings') { - return _reply(true, true, true); - } - return _reply(true, true, false); - }); - await tester.pumpWidget(_host(gateway, cupertino: cupertino)); - await tester.pumpAndSettle(); - await tester.tap(find.byKey(ntfySettingKey('chat_reply_finished'))); - await tester.pumpAndSettle(); - expect(gateway.calls, hasLength(2)); - expect(gateway.calls.last.$1, 'set_notification_settings'); - expect(gateway.calls.last.$2, { - 'notification_settings': {'chat_reply_finished': true}, - }); - expect( - _checked(tester, 'chat_reply_finished', cupertino: cupertino), - isTrue, - ); - expect(find.byKey(ntfyErrorKey), findsNothing); + testWidgets('failure reverts and shows the refusal', (tester) async { + final pending = Completer(); + final gateway = _Gateway((type, _) { + if (type == 'set_notification_settings') return pending.future; + return _reply(true, true, false); }); - - testWidgets('$style failure reverts and shows the refusal', (tester) async { - final pending = Completer(); - final gateway = _Gateway((type, _) { - if (type == 'set_notification_settings') return pending.future; - return _reply(true, true, false); - }); - await tester.pumpWidget(_host(gateway, cupertino: cupertino)); - await tester.pumpAndSettle(); - await tester.tap(find.byKey(ntfySettingKey('run_finished'))); - await tester.pump(); - // The change shows at once and the group is disabled while it saves. - expect(_checked(tester, 'run_finished', cupertino: cupertino), isFalse); - await tester.tap(find.byKey(ntfySettingKey('chat_needs_you'))); - await tester.pump(); - expect(gateway.calls, hasLength(2)); - pending.completeError(const ProtocolError('settings are read-only')); - await tester.pumpAndSettle(); - expect(_checked(tester, 'run_finished', cupertino: cupertino), isTrue); - expect(_checked(tester, 'chat_needs_you', cupertino: cupertino), isTrue); - expect( - find.text('Could not save: settings are read-only'), - findsOneWidget, - ); - }); - } + await tester.pumpWidget(_host(gateway)); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(ntfySettingKey('run_finished'))); + await tester.pump(); + // The change shows at once and the group is disabled while it saves. + expect(_checked(tester, 'run_finished'), isFalse); + await tester.tap(find.byKey(ntfySettingKey('chat_needs_you'))); + await tester.pump(); + expect(gateway.calls, hasLength(2)); + pending.completeError(const ProtocolError('settings are read-only')); + await tester.pumpAndSettle(); + expect(_checked(tester, 'run_finished'), isTrue); + expect(_checked(tester, 'chat_needs_you'), isTrue); + expect( + find.text('Could not save: settings are read-only'), + findsOneWidget, + ); + }); testWidgets('disabled while loading and offline', (tester) async { final pending = Completer(); final gateway = _Gateway((_, _) => pending.future); - await tester.pumpWidget(_host(gateway, cupertino: false)); + await tester.pumpWidget(_host(gateway)); await tester.pump(); expect(find.text('Loading…'), findsOneWidget); await tester.tap(find.byKey(ntfySettingKey('run_finished'))); @@ -181,7 +156,7 @@ void main() { if (fail) throw const ProtocolError('no store'); return _reply(false, true, false); }); - await tester.pumpWidget(_host(gateway, cupertino: false)); + await tester.pumpWidget(_host(gateway)); await tester.pumpAndSettle(); expect( find.text('Could not load notification settings: no store'), @@ -210,38 +185,27 @@ void main() { testWidgets('hidden when the server does not send it', (tester) async { final gateway = _Gateway((_, _) => _reply(true, true, false)); - await tester.pumpWidget(_host(gateway, cupertino: false)); + await tester.pumpWidget(_host(gateway)); await tester.pumpAndSettle(); expect(find.byKey(ntfySettingKey('ntfy_enabled')), findsNothing); expect(find.text(ntfySectionSubtitle), findsOneWidget); }); - for (final cupertino in [false, true]) { - testWidgets( - '${cupertino ? 'Cupertino' : 'Material'} shows and writes it', - (tester) async { - final gateway = _Gateway( - (type, _) => withNtfy(type == 'set_notification_settings'), - ); - await tester.pumpWidget(_host(gateway, cupertino: cupertino)); - await tester.pumpAndSettle(); - expect(find.text('Also send to ntfy'), findsOneWidget); - expect(find.text(ntfySectionAppSubtitle), findsOneWidget); - expect( - _checked(tester, 'ntfy_enabled', cupertino: cupertino), - isFalse, - ); - await tester.tap(find.byKey(ntfySettingKey('ntfy_enabled'))); - await tester.pumpAndSettle(); - expect(gateway.calls.last.$2, { - 'notification_settings': {'ntfy_enabled': true}, - }); - expect( - _checked(tester, 'ntfy_enabled', cupertino: cupertino), - isTrue, - ); - }, + testWidgets('shows and writes it', (tester) async { + final gateway = _Gateway( + (type, _) => withNtfy(type == 'set_notification_settings'), ); - } + await tester.pumpWidget(_host(gateway)); + await tester.pumpAndSettle(); + expect(find.text('Also send to ntfy'), findsOneWidget); + expect(find.text(ntfySectionAppSubtitle), findsOneWidget); + expect(_checked(tester, 'ntfy_enabled'), isFalse); + await tester.tap(find.byKey(ntfySettingKey('ntfy_enabled'))); + await tester.pumpAndSettle(); + expect(gateway.calls.last.$2, { + 'notification_settings': {'ntfy_enabled': true}, + }); + expect(_checked(tester, 'ntfy_enabled'), isTrue); + }); }); } diff --git a/app/test/features/settings/settings_quick_switch_control_test.dart b/app/test/features/settings/settings_quick_switch_control_test.dart index 05805b0e..77803043 100644 --- a/app/test/features/settings/settings_quick_switch_control_test.dart +++ b/app/test/features/settings/settings_quick_switch_control_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/settings/settings_animation_section.dart'; @@ -18,55 +17,42 @@ class _Store implements QuickSwitchAnimationStore { } void main() { - for (final cupertino in [false, true]) { - testWidgets('chooses and saves quick switch animation ($cupertino)', ( - tester, - ) async { - final store = _Store(); - final controller = QuickSwitchAnimationController(store: store); - final speed = AnimationSpeedController(); - final child = SettingsAnimationSection( - controller: speed, - quickSwitchController: controller, - ); - await tester.pumpWidget( - cupertino - ? CupertinoApp( - home: CupertinoPageScaffold( - child: SingleChildScrollView(child: child), - ), - ) - : MaterialApp( - home: Scaffold(body: SingleChildScrollView(child: child)), - ), - ); - expect(find.text('Quick switch animation'), findsOneWidget); - expect( - cupertino ? find.byType(CupertinoSlider) : find.byType(Slider), - findsOneWidget, - ); - await tester.tap(find.text('Tape')); - await tester.pumpAndSettle(); - await tester.tap(find.text('Card deck').last); - await tester.pumpAndSettle(); - expect(controller.value, QuickSwitchAnimation.cardStack); - expect(store.saved, 'cardStack'); - expect( - find.text(QuickSwitchAnimation.cardStack.description), - findsOneWidget, - ); - store.success = false; - await tester.tap(find.text('Card deck')); - await tester.pumpAndSettle(); - await tester.tap(find.text('Swap').last); - await tester.pumpAndSettle(); - expect( - find.text('Could not save; applies until reload.'), - findsOneWidget, - ); - expect(tester.takeException(), isNull); - controller.dispose(); - speed.dispose(); - }); - } + testWidgets('chooses and saves quick switch animation', (tester) async { + final store = _Store(); + final controller = QuickSwitchAnimationController(store: store); + final speed = AnimationSpeedController(); + final child = SettingsAnimationSection( + controller: speed, + quickSwitchController: controller, + ); + await tester.pumpWidget( + MaterialApp( + home: Scaffold(body: SingleChildScrollView(child: child)), + ), + ); + expect(find.text('Quick switch animation'), findsOneWidget); + expect(find.byType(Slider), findsOneWidget); + await tester.tap(find.text('Tape')); + await tester.pumpAndSettle(); + await tester.tap(find.text('Card deck').last); + await tester.pumpAndSettle(); + expect(controller.value, QuickSwitchAnimation.cardStack); + expect(store.saved, 'cardStack'); + expect( + find.text(QuickSwitchAnimation.cardStack.description), + findsOneWidget, + ); + store.success = false; + await tester.tap(find.text('Card deck')); + await tester.pumpAndSettle(); + await tester.tap(find.text('Swap').last); + await tester.pumpAndSettle(); + expect( + find.text('Could not save; applies until reload.'), + findsOneWidget, + ); + expect(tester.takeException(), isNull); + controller.dispose(); + speed.dispose(); + }); } diff --git a/app/test/features/settings/settings_screen_test.dart b/app/test/features/settings/settings_screen_test.dart index 7dbfb175..29d0b28a 100644 --- a/app/test/features/settings/settings_screen_test.dart +++ b/app/test/features/settings/settings_screen_test.dart @@ -11,7 +11,6 @@ import 'package:pipelines_app/features/settings/settings_store.dart'; import 'fake_channel.dart'; import 'settings_topic_test_helper.dart'; -import 'package:pipelines_app/ui/adaptive/segmented_bar.dart'; void main() { testWidgets('renders idle settings without opening a connection', ( @@ -258,23 +257,6 @@ void main() { expect(find.byKey(SettingsKeys.connect), findsOneWidget); }); - testWidgets('an explicit Cupertino host uses Cupertino fields and buttons', ( - tester, - ) async { - final factory = FakeChannelFactory(); - final client = transport.PipelinesClient(channelFactory: factory.call); - addTearDown(client.dispose); - - await _pump(tester, client, cupertino: true); - - expect(find.byType(SegmentedBar), findsOneWidget); - expect(find.byType(CupertinoTextField), findsNWidgets(2)); - expect(find.byType(TextField), findsNothing); - expect(find.byType(FilledButton), findsNothing); - expect(find.byKey(SettingsKeys.connect), findsOneWidget); - expect(find.text('Trusted LAN/VPN only'), findsOneWidget); - }); - testWidgets('narrow window with large text scrolls without overflow', ( tester, ) async { @@ -375,26 +357,11 @@ Future _pump( transport.PipelinesClient client, { SettingsStore? store, TargetPlatform platform = TargetPlatform.android, - bool cupertino = false, double textScale = 1, Size size = const Size(800, 1200), }) async { await tester.binding.setSurfaceSize(size); addTearDown(() => tester.binding.setSurfaceSize(null)); - if (cupertino) { - await tester.pumpWidget( - CupertinoApp( - home: SettingsScreen( - client: client, - store: store ?? MemorySettingsStore(), - ), - ), - ); - await tester.pump(); - await tester.pump(); - await selectSettingsTopic(tester, 'Connection'); - return; - } await tester.pumpWidget( MaterialApp( theme: ThemeData(platform: platform),