Merge commit '122f9fcd33b256842fcbde729e76fd031d988314' into pipelines/run-20261111-0040-cupertino-out-ui-status-text-scale-3de6

This commit is contained in:
2026-11-11 01:09:47 +00:00
9 changed files with 256 additions and 317 deletions
+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.
+41
View File
@@ -0,0 +1,41 @@
# Onboarding: Material-only
Removed the Cupertino branch from `lib/features/onboarding`:
- `onboarding_flow.dart`: Material `Scaffold`, `TextField` (outline border),
`FilledButton` with a small `CircularProgressIndicator`, `TextButton` for
"Change server", theme error colour and `headlineSmall` title. Dropped the
unused `flutter/cupertino.dart` and `ui/adaptive/host.dart` imports.
- `discovery/discovery_panel.dart`: `OutlinedButton.icon` scan action, Material
busy indicator and theme error colour.
- `discovery/discovered_server_row.dart`: Material `ListTile`,
`CheckboxListTile` and `FilledButton`; Cupertino list tiles, chevrons,
checkbox and activity indicators removed.
Public constructors (`OnboardingFlow`, `DiscoveryPanel`, `DiscoveredServerRow`)
are unchanged; no `cupertino` parameters existed there. Private helpers lost
their now-unused `cupertino`/`context` arguments. No Cupertino icons or colours
are kept: the Material path uses none of them.
## Affected UI states
First run server entry, machine name, discovery idle/scanning/empty/error, the
discovered single-route row, the multi-route checklist and "Use <name>", the
sign-in step, probe error text and the "Change server" action. All render the
same Material widgets as before on the Material path; no layout or copy changed.
## Checks
- `tool/memwatch/full.sh 'test/features/onboarding '` — PASS, 24 tests, exit 0.
- `tool/memwatch/full.sh 'test/features/settings/saved_server_discovery_test.dart
test/application/pipelines_root_test.dart
test/application/zero_server_recovery_test.dart'` — PASS, 7 tests, exit 0
(other users of `OnboardingFlow`/`DiscoveryPanel`).
- `tool/analyze.sh` — clean, exit 0.
- `grep -rn 'Cupertino\|cupertino' lib/features/onboarding test/features/onboarding`
— no matches.
Test change: `discovery_panel_test.dart` lost its `CupertinoApp` host variant and
the `CupertinoListTile` expectation; the `host` helper now always builds a
`MaterialApp`. No Material test expectation changed. No UI capture was taken in
this stage.