Merge commit '970b7cb16d2a25a9b3017d509f515186eae3c9d4' into pipelines/run-20261111-0040-cupertino-out-onboarding-b13c

This commit is contained in:
2026-11-11 01:05:06 +00:00
4 changed files with 162 additions and 139 deletions
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'app_updates.dart';
@@ -10,113 +9,60 @@ Future<bool?> showLaunchUpdateDialog(
required bool cupertino,
String sourceName = '',
String nativePlatform = 'android',
}) => cupertino
? showCupertinoDialog<bool>(
context: context,
builder: (context) => CupertinoAlertDialog(
title: const Text('Update available'),
content: Text(
web
? 'A newer Pipelines web build is available.'
: 'A newer ${nativePlatform == 'macos'
? 'macOS'
: nativePlatform == 'linux'
? 'Linux'
: 'Android'} build is available${sourceName.isEmpty ? '' : ' from $sourceName'}.${switch (nativePlatform) {
'linux' => ' Pipelines installs it and restarts.',
'macos' => ' Download and extract the archive to update the app.',
_ => '',
}}',
),
actions: [
CupertinoDialogAction(
onPressed: () => Navigator.pop(context, false),
child: const Text('Later'),
),
CupertinoDialogAction(
isDefaultAction: true,
onPressed: () => Navigator.pop(context, true),
child: Text(
web
? 'Refresh'
: nativePlatform == 'linux'
? 'Install and restart'
: 'Download',
),
),
],
}) => showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Update available'),
content: Text(
web
? 'A newer Pipelines web build is available.'
: 'A newer ${nativePlatform == 'macos'
? 'macOS'
: nativePlatform == 'linux'
? 'Linux'
: 'Android'} build is available${sourceName.isEmpty ? '' : ' from $sourceName'}.${switch (nativePlatform) {
'linux' => ' Pipelines installs it and restarts.',
'macos' => ' Download and extract the archive to update the app.',
_ => '',
}}',
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('Later'),
),
FilledButton(
onPressed: () => Navigator.pop(context, true),
child: Text(
web
? 'Refresh'
: nativePlatform == 'linux'
? 'Install and restart'
: 'Download',
),
)
: showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Update available'),
content: Text(
web
? 'A newer Pipelines web build is available.'
: 'A newer ${nativePlatform == 'macos'
? 'macOS'
: nativePlatform == 'linux'
? 'Linux'
: 'Android'} build is available${sourceName.isEmpty ? '' : ' from $sourceName'}.${switch (nativePlatform) {
'linux' => ' Pipelines installs it and restarts.',
'macos' => ' Download and extract the archive to update the app.',
_ => '',
}}',
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('Later'),
),
FilledButton(
onPressed: () => Navigator.pop(context, true),
child: Text(
web
? 'Refresh'
: nativePlatform == 'linux'
? 'Install and restart'
: 'Download',
),
),
],
),
);
),
],
),
);
Future<void> showLaunchUpdateFailure(
BuildContext context,
Object error, {
required bool cupertino,
}) async {
if (cupertino) {
await showCupertinoDialog<void>(
context: context,
builder: (context) => CupertinoAlertDialog(
title: const Text('Update failed'),
content: Text('$error'),
actions: [
CupertinoDialogAction(
onPressed: () => Navigator.pop(context),
child: const Text('OK'),
),
],
),
);
} else {
await showDialog<void>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Update failed'),
content: Text('$error'),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('OK'),
),
],
),
);
}
await showDialog<void>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Update failed'),
content: Text('$error'),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('OK'),
),
],
),
);
}
/// Reuses the Settings installer while keeping download progress visible.
@@ -126,24 +72,11 @@ Future<void> installLaunchUpdate(
required UpdateInstaller installer,
required bool cupertino,
}) async {
final result = cupertino
? await showCupertinoDialog<_InstallResult>(
context: context,
builder: (_) => _InstallProgress(
update: update,
installer: installer,
cupertino: true,
),
)
: await showDialog<_InstallResult>(
context: context,
barrierDismissible: false,
builder: (_) => _InstallProgress(
update: update,
installer: installer,
cupertino: false,
),
);
final result = await showDialog<_InstallResult>(
context: context,
barrierDismissible: false,
builder: (_) => _InstallProgress(update: update, installer: installer),
);
if (result?.error case final Object error) throw error;
}
@@ -153,14 +86,9 @@ class _InstallResult {
}
class _InstallProgress extends StatefulWidget {
const _InstallProgress({
required this.update,
required this.installer,
required this.cupertino,
});
const _InstallProgress({required this.update, required this.installer});
final AppUpdate update;
final UpdateInstaller installer;
final bool cupertino;
@override
State<_InstallProgress> createState() => _InstallProgressState();
@@ -200,19 +128,12 @@ class _InstallProgressState extends State<_InstallProgress> {
: 'Downloading update… ${(progress * 100).round()}%',
),
const SizedBox(height: 16),
widget.cupertino
? const CupertinoActivityIndicator()
: LinearProgressIndicator(value: progress),
LinearProgressIndicator(value: progress),
],
);
return PopScope(
canPop: false,
child: widget.cupertino
? CupertinoAlertDialog(
title: const Text('App update'),
content: content,
)
: AlertDialog(title: const Text('App update'), content: content),
child: AlertDialog(title: const Text('App update'), content: content),
);
}
}
+42
View File
@@ -0,0 +1,42 @@
# Cupertino removal — lib/features/updates
## Change
- `lib/features/updates/launch_update_dialog.dart`: deleted the Cupertino dialog
branches from `showLaunchUpdateDialog`, `showLaunchUpdateFailure` and
`installLaunchUpdate`, and from the private `_InstallProgress` widget
(`CupertinoAlertDialog`, `CupertinoActivityIndicator`, `CupertinoDialogAction`,
`showCupertinoDialog`). The Material `AlertDialog`/`LinearProgressIndicator`
path is unchanged.
- Public signatures keep `required bool cupertino` (unused now) so callers in
other directories continue to compile; nothing outside `lib/features/updates`
was edited.
- Removed the `package:flutter/cupertino.dart` import; no `CupertinoIcons` or
`CupertinoColors` were used in this directory.
## Tests
- `test/features/updates/native_update_dialog_test.dart`: existing Material
prompt loop retained (`cupertino: false`). Added regression tests for the
Material failure alert and the Material install-progress dialog/progress bar.
No Cupertino test variants were present to delete.
- `test/application/startup_update_flow_test.dart` (review follow-up): the web
refresh test no longer mounts with `cupertino: true`; it now asserts the
Material `AlertDialog`. The local `mount` helper lost its unused `cupertino`
parameter and passes `cupertino: false` explicitly. The
`package:flutter/cupertino.dart` import became `package:flutter/material.dart`.
- `test/application/startup_update_check_test.dart` already mounted Material
only (`cupertino: false`); no change.
- No other test reaches these dialogs with `cupertino: true` or a `CupertinoApp`
host; the remaining `cupertino: true` tests elsewhere cover unrelated UI.
## Checks
- `tool/analyze.sh`: clean (16s, exit 0).
- `tool/memwatch/full.sh 'test/features/updates test/application/startup_update_flow_test.dart test/application/startup_update_check_test.dart'`:
38 passed, 0 failed, 0 skipped; 38s; exit 0.
- `grep -rn 'Cupertino\|cupertino' lib/features/updates`: only the three kept
`required bool cupertino` parameters. In the update tests only `cupertino:
false` arguments remain.
## UI states
- Update-available prompt, update-failure alert and install-progress dialog now
always render the existing Material variants. No pixel change on the Material
path; Cupertino host paths are unreachable in this Material-only app.
@@ -1,6 +1,6 @@
import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pipelines_app/application/pipelines_app.dart';
import 'package:pipelines_app/application/server_endpoint.dart';
@@ -14,7 +14,6 @@ void main() {
Future<void> mount(
WidgetTester tester, {
bool web = true,
bool cupertino = false,
Future<String?> Function(Uri)? read,
Future<void> Function()? refresh,
UpdateInstaller? installer,
@@ -31,7 +30,7 @@ void main() {
web: true,
),
client: PipelinesClient(channelFactory: (_) => channel),
cupertino: cupertino,
cupertino: false,
routeInformationProvider: provider,
webPlatform: web,
webPageUri: Uri.parse('https://app.test/chats?selected=1'),
@@ -180,7 +179,6 @@ void main() {
var refreshes = 0;
await mount(
tester,
cupertino: true,
read: (uri) async {
expect(uri, Uri.parse('https://app.test/release.json'));
return '{"schema":1,"platform":"web","buildId":"web-new"}';
@@ -189,7 +187,7 @@ void main() {
refreshes++;
},
);
expect(find.byType(CupertinoAlertDialog), findsOneWidget);
expect(find.byType(AlertDialog), findsOneWidget);
expect(refreshes, 0);
await tester.tap(find.text('Refresh'));
await tester.pump();
@@ -1,5 +1,8 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pipelines_app/features/updates/app_updates.dart';
import 'package:pipelines_app/features/updates/launch_update_dialog.dart';
void main() {
@@ -34,4 +37,63 @@ void main() {
expect(find.textContaining('Android'), findsNothing);
});
}
testWidgets('update failure uses a Material alert', (tester) async {
await tester.pumpWidget(
MaterialApp(
home: Builder(
builder: (context) => TextButton(
onPressed: () =>
showLaunchUpdateFailure(context, 'boom', cupertino: false),
child: const Text('Fail'),
),
),
),
);
await tester.tap(find.text('Fail'));
await tester.pumpAndSettle();
expect(find.byType(AlertDialog), findsOneWidget);
expect(find.text('Update failed'), findsOneWidget);
expect(find.text('boom'), findsOneWidget);
expect(find.text('OK'), findsOneWidget);
});
testWidgets('install progress uses a Material alert and progress bar', (
tester,
) async {
final finished = Completer<void>();
late BuildContext dialogContext;
await tester.pumpWidget(
MaterialApp(
home: Builder(
builder: (context) {
dialogContext = context;
return const SizedBox();
},
),
),
);
final install = installLaunchUpdate(
dialogContext,
AppUpdate(
versionCode: 2,
versionName: '2.0',
apk: Uri.parse('https://example.test/app.apk'),
),
installer: (update, {onProgress}) async {
onProgress?.call(0.5);
await finished.future;
},
cupertino: false,
);
await tester.pumpAndSettle();
expect(find.byType(AlertDialog), findsOneWidget);
expect(find.byType(LinearProgressIndicator), findsOneWidget);
expect(find.text('App update'), findsOneWidget);
expect(find.text('Downloading update… 50%'), findsOneWidget);
finished.complete();
await tester.pumpAndSettle();
expect(find.byType(AlertDialog), findsNothing);
await install;
});
}