Merge commit '66cb9edee1367da311589ecfacc3ac312dc1a395' into pipelines/run-20261111-1951-material-cleanup-shared-ui-primitives-65fb

This commit is contained in:
2026-11-11 21:10:21 +00:00
20 changed files with 146 additions and 105 deletions
@@ -2,6 +2,8 @@ import 'dart:typed_data';
import 'package:flutter/material.dart';
import '../../../ui/adaptive/app_popups.dart';
import '../../../ui/adaptive/floating_bar_layout.dart';
import '../actions/artifact_file_actions.dart';
import '../actions/artifact_file_bridge.dart';
@@ -168,9 +170,8 @@ class ArtifactViewerInfoAction extends StatelessWidget {
final Widget facts;
void _show(BuildContext context) {
showModalBottomSheet<void>(
context: context,
showDragHandle: true,
showAppDetails<void>(
context,
builder: (context) => SafeArea(
child: SingleChildScrollView(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
@@ -2,6 +2,8 @@ import 'dart:math' as math;
import 'package:flutter/material.dart';
import '../../../ui/adaptive/app_popups.dart';
enum DiffForm { rendered, raw }
const diffFormLabels = <DiffForm, String>{
@@ -48,7 +50,7 @@ Widget diffFormControl(
);
}
/// Native action sheet/bottom sheet when fixed segment labels cannot fit.
/// An anchored desktop menu or narrow sheet when segment labels cannot fit.
Widget diffFormMenu(
BuildContext context, {
required DiffForm form,
@@ -59,9 +61,8 @@ Widget diffFormMenu(
constraints: const BoxConstraints(minWidth: 48, minHeight: 48),
padding: EdgeInsets.zero,
icon: const Icon(Icons.more_vert, size: 28),
onPressed: () => showModalBottomSheet<void>(
context: context,
showDragHandle: true,
onPressed: () => showAppChoiceMenu<void>(
context,
builder: (sheetContext) => SafeArea(
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -77,13 +78,16 @@ Widget diffFormMenu(
),
),
for (final entry in diffFormLabels.entries)
ListTile(
title: Text(entry.value),
AppChoiceMenuItem(
selected: entry.key == form,
// At accessibility text sizes the check mark otherwise leaves
// too little room for the longest label in the phone sheet.
contentPadding: EdgeInsets.zero,
onTap: () {
Navigator.of(sheetContext).pop();
onChanged(entry.key);
},
child: Text(entry.value),
),
],
),
@@ -63,7 +63,6 @@ mixin _ChatScreenFloat on State<ChatScreen>, _ChatScreenWorkspace {
label: 'Float (${chatFloatShortcutLabel()})',
onPressed: () => _floatPane(pane.id),
materialIcon: Icons.picture_in_picture_alt_outlined,
cupertinoIcon: CupertinoIcons.rectangle_on_rectangle,
),
];
}
@@ -39,9 +39,7 @@ mixin _ChatScreenWorkspace on State<ChatScreen> {
ChatCompactSidebar(
navigation: navigation?.registry.canNavigate == true
? ShellDestinationMenu(
cupertino:
chatControlsStyleOf(context) ==
ChatControlsStyle.cupertino,
cupertino: false,
current: AppDestination.chat,
onSelected: navigation!.registry.navigateTo,
)
-6
View File
@@ -13,7 +13,6 @@ import 'dart:async';
import '../../ui/motion/motion.dart';
import '../../ui/motion/container_transform_source.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart' show setEquals;
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
@@ -407,14 +406,12 @@ class _ChatScreenState extends State<ChatScreen>
label: 'Add chat pane',
onPressed: () => _addPane(paneContext),
materialIcon: Icons.add_box_outlined,
cupertinoIcon: CupertinoIcons.plus_square,
),
if (_workspace.paneCount > 1)
ChatBarAction(
label: 'Open chats (${_workspace.paneCount})',
onPressed: () => _pickPane(paneContext),
materialIcon: Icons.view_quilt_outlined,
cupertinoIcon: CupertinoIcons.square_split_2x2,
),
if (_workspace.paneCount > 1 && showsListBesideDetail(context))
chatCenterStageAction(ChatCenterStageController.instance),
@@ -428,7 +425,6 @@ class _ChatScreenState extends State<ChatScreen>
label: 'Close pane',
onPressed: () => _closePane(pane.id),
materialIcon: Icons.close,
cupertinoIcon: CupertinoIcons.xmark,
),
],
),
@@ -507,8 +503,6 @@ class _ChatScreenState extends State<ChatScreen>
),
ChatWorkspaceEntrance(
visible: selected != null,
cupertino:
chatControlsStyleOf(context) == ChatControlsStyle.cupertino,
child: ExcludeFocus(
excluding: selected == null,
child: MediaQuery(
@@ -7,39 +7,33 @@ import 'folder_picker_status.dart';
/// The body: loading, the inline error, or recent folders (home level only)
/// followed by the current folder's folders and its dimmed, unselectable files.
class FolderPickerList extends StatelessWidget {
const FolderPickerList({
super.key,
required this.cupertino,
required this.controller,
});
const FolderPickerList({super.key, required this.controller});
final bool cupertino;
final FolderPickerController controller;
@override
Widget build(BuildContext context) {
final listing = controller.listing;
if (controller.error != null) {
return FolderPickerError(cupertino: cupertino, controller: controller);
return FolderPickerError(controller: controller);
}
if (listing == null) {
return FolderPickerLoading(cupertino: cupertino);
return FolderPickerLoading();
}
final entries = controller.entries;
final recents = controller.filter.trim().isEmpty
? controller.recents
: const <String>[];
final rows = <Widget>[
if (controller.loading) FolderPickerLoadingBar(cupertino: cupertino),
if (controller.loading) const FolderPickerLoadingBar(),
if (recents.isNotEmpty) ...[
FolderSectionHeader(cupertino: cupertino, text: 'Recent folders'),
const FolderSectionHeader(text: 'Recent folders'),
for (final path in recents)
_RecentRow(
label: homeRelativeLabel(listing.home, path),
onTap: () => controller.open(path),
),
FolderSectionHeader(
cupertino: cupertino,
text: 'In ${homeRelativeLabel(listing.home, listing.path)}',
),
],
@@ -52,7 +46,6 @@ class FolderPickerList extends StatelessWidget {
),
if (entries.isEmpty)
FolderPickerNote(
cupertino: cupertino,
text: controller.filter.trim().isNotEmpty
? 'Nothing here matches “${controller.filter.trim()}”.'
: controller.hiddenCount > 0
@@ -61,7 +54,6 @@ class FolderPickerList extends StatelessWidget {
),
if (listing.truncated)
FolderPickerNote(
cupertino: cupertino,
text:
'This folder is large; only the first entries are shown. '
'Use the filter or type the path instead.',
@@ -107,7 +99,7 @@ class _EntryRow extends StatelessWidget {
? Row(
mainAxisSize: MainAxisSize.min,
children: [
if (entry.isGitRepo) const FolderGitBadge(cupertino: false),
if (entry.isGitRepo) const FolderGitBadge(),
const SizedBox(width: 4),
const Icon(Icons.chevron_right),
],
@@ -129,9 +121,7 @@ class _EntryRow extends StatelessWidget {
/// The small "git" mark on a repository folder.
class FolderGitBadge extends StatelessWidget {
const FolderGitBadge({super.key, required this.cupertino});
final bool cupertino;
const FolderGitBadge({super.key});
@override
Widget build(BuildContext context) {
@@ -80,17 +80,10 @@ class _FolderPickerPageState extends State<FolderPickerPage> {
final body = Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
FolderBreadcrumbs(cupertino: false, controller: _controller),
FolderPickerToolbar(
cupertino: false,
controller: _controller,
filter: _filter,
),
Expanded(
child: FolderPickerList(cupertino: false, controller: _controller),
),
FolderBreadcrumbs(controller: _controller),
FolderPickerToolbar(controller: _controller, filter: _filter),
Expanded(child: FolderPickerList(controller: _controller)),
FolderStartBar(
cupertino: false,
path: _controller.selectable,
home: _controller.home,
onStart: _start,
@@ -7,13 +7,8 @@ import 'folder_picker_purpose.dart';
/// The path from `~` to the current folder; every crumb but the last opens
/// that folder. It scrolls so the current folder stays visible.
class FolderBreadcrumbs extends StatelessWidget {
const FolderBreadcrumbs({
super.key,
required this.cupertino,
required this.controller,
});
const FolderBreadcrumbs({super.key, required this.controller});
final bool cupertino;
final FolderPickerController controller;
@override
@@ -88,12 +83,10 @@ class FolderBreadcrumbs extends StatelessWidget {
class FolderPickerToolbar extends StatelessWidget {
const FolderPickerToolbar({
super.key,
required this.cupertino,
required this.controller,
required this.filter,
});
final bool cupertino;
final FolderPickerController controller;
final TextEditingController filter;
@@ -153,14 +146,12 @@ class FolderPickerToolbar extends StatelessWidget {
class FolderStartBar extends StatelessWidget {
const FolderStartBar({
super.key,
required this.cupertino,
required this.path,
required this.home,
required this.onStart,
this.purpose = FolderPickerPurpose.startChat,
});
final bool cupertino;
final String? path;
final String? home;
final VoidCallback onStart;
@@ -5,9 +5,7 @@ import 'folder_picker_controller.dart';
/// First load: a centred native activity indicator.
class FolderPickerLoading extends StatelessWidget {
const FolderPickerLoading({super.key, required this.cupertino});
final bool cupertino;
const FolderPickerLoading({super.key});
@override
Widget build(BuildContext context) {
@@ -22,9 +20,7 @@ class FolderPickerLoading extends StatelessWidget {
/// A later load keeps the previous listing on screen under a thin indicator.
class FolderPickerLoadingBar extends StatelessWidget {
const FolderPickerLoadingBar({super.key, required this.cupertino});
final bool cupertino;
const FolderPickerLoadingBar({super.key});
@override
Widget build(BuildContext context) {
@@ -38,13 +34,8 @@ class FolderPickerLoadingBar extends StatelessWidget {
/// The server's refusal shown in place (outside home, permission denied,
/// missing folder), with Retry, Back to the last good folder, and Home.
class FolderPickerError extends StatelessWidget {
const FolderPickerError({
super.key,
required this.cupertino,
required this.controller,
});
const FolderPickerError({super.key, required this.controller});
final bool cupertino;
final FolderPickerController controller;
@override
@@ -97,13 +88,8 @@ class FolderPickerError extends StatelessWidget {
/// A section label above recent folders and the folder's own entries.
class FolderSectionHeader extends StatelessWidget {
const FolderSectionHeader({
super.key,
required this.cupertino,
required this.text,
});
const FolderSectionHeader({super.key, required this.text});
final bool cupertino;
final String text;
@override
@@ -120,13 +106,8 @@ class FolderSectionHeader extends StatelessWidget {
/// A quiet explanatory line (empty folder, no matches, truncated listing).
class FolderPickerNote extends StatelessWidget {
const FolderPickerNote({
super.key,
required this.cupertino,
required this.text,
});
const FolderPickerNote({super.key, required this.text});
final bool cupertino;
final String text;
@override
@@ -1,14 +1,6 @@
import '../../../../ui/adaptive/segmented_bar_overflow.dart';
import 'package:flutter/material.dart';
/// Which standard control family this screen renders.
enum ChatControlsStyle { material, cupertino }
/// Always Material: the app is Material-only, so no screen ever asks for the
/// Cupertino family. The parameter stays for callers.
ChatControlsStyle chatControlsStyleOf(BuildContext context) =>
ChatControlsStyle.material;
class ChatBarAction extends StatelessWidget implements SegmentedOverflowable {
const ChatBarAction({
super.key,
@@ -23,8 +15,10 @@ class ChatBarAction extends StatelessWidget implements SegmentedOverflowable {
final VoidCallback onPressed;
final IconData materialIcon;
/// Kept for callers; the Material toolbar always draws [materialIcon].
/// Compatibility for callers not yet migrated; Material always uses
/// [materialIcon].
final IconData? cupertinoIcon;
final String? identifier;
/// A narrow bar moves it into its More menu, under the bar's host's icon.
@@ -4,7 +4,6 @@ import 'chat_machine_picker.dart';
import '../../../../ui/adaptive/segmented_bar.dart';
import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../../ui/layout/content_width.dart';
@@ -437,14 +436,12 @@ class _ChatSessionsScreenState extends State<ChatSessionsScreen> {
label: 'New chat',
onPressed: _newChat,
materialIcon: Icons.add,
cupertinoIcon: CupertinoIcons.add,
),
ChatBarAction(
key: const Key('chat-refresh'),
label: 'Refresh',
onPressed: _controller.refresh,
materialIcon: Icons.refresh,
cupertinoIcon: CupertinoIcons.refresh,
),
];
}
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../ui/sessions/chat_adaptive.dart';
@@ -16,8 +15,5 @@ ChatBarAction chatCenterStageAction(ChatCenterStageController controller) {
materialIcon: controller.value
? Icons.view_quilt_outlined
: Icons.center_focus_strong_outlined,
cupertinoIcon: controller.value
? CupertinoIcons.square_split_2x2
: CupertinoIcons.viewfinder,
);
}
@@ -9,12 +9,10 @@ class ChatWorkspaceEntrance extends StatefulWidget {
const ChatWorkspaceEntrance({
super.key,
required this.visible,
required this.cupertino,
required this.child,
});
final bool visible;
final bool cupertino;
final Widget child;
@override
+3
View File
@@ -65,16 +65,19 @@ class AppChoiceMenuItem extends StatelessWidget {
required this.child,
required this.selected,
required this.onTap,
this.contentPadding,
});
final Widget child;
final bool selected;
final VoidCallback? onTap;
final EdgeInsetsGeometry? contentPadding;
@override
Widget build(BuildContext context) => ListTile(
enabled: onTap != null,
title: child,
contentPadding: contentPadding,
trailing: selected
? Icon(Icons.check, color: Theme.of(context).colorScheme.primary)
: null,
+27
View File
@@ -0,0 +1,27 @@
# Material chat cleanup evidence
- Removed live Cupertino imports, icon metadata, the obsolete `ChatControlsStyle`
branch, and unused always-false presentation helpers from the assigned chat
lanes.
- Removed local Cupertino compatibility flags from workspace entrance and folder
picker widgets; shared `SegmentedBar`/`SegmentedBackButton` compatibility
arguments remain because those APIs are outside this lane.
- Preserved Material icons, native back behavior, pane focus, workspace
transitions, folder navigation, and session behavior.
- Focused watchdog: 50 passed, 0 failed across sessions, folder picker,
workspace entrance/workspace, floating pane, focus, toolbar tint, and header
tests.
- `tool/analyze.sh`: clean.
- No rendered capture was performed; these changes remove alternate metadata and
branches without changing Material layout or visual behavior.
## Land-gate regression follow-up
- Fixed the narrow 2x-text diff-form bottom sheet: its selected check mark no
longer reduces the `Rendered` title below the width of the whole word.
- Added optional `contentPadding` to the shared Material `AppChoiceMenuItem`;
only the diff-form menu uses zero padding for this constrained case.
- Focused watchdog: 16 passed, 0 failed in
`test/features/changes/diff_presentation_test.dart` and
`test/ui/adaptive/app_popups_test.dart`.
- `tool/analyze.sh`: clean.
@@ -14,3 +14,11 @@
Material widgets and layouts.
- Remaining shared compatibility metadata/flags are outside this focused edit
and should be removed only after all callers migrate during final integration.
## Remaining desktop popups
The manager completed two additional unconditional-sheet paths from the audit:
diff-form choices now use the shared anchored choice menu on desktop, and
artifact facts use the shared bounded details dialog. Narrow layouts retain
Material bottom sheets. Wide/narrow selection and dismissal regressions plus
the artifact viewer page tests passed: 24 tests, zero failures.
@@ -0,0 +1,74 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pipelines_app/features/artifacts/ui/artifact_viewer_body.dart';
import 'package:pipelines_app/features/changes/widgets/diff_form_control.dart';
void main() {
for (final width in [400.0, 1000.0]) {
testWidgets('diff choices adapt to app width $width', (tester) async {
tester.view.physicalSize = Size(width, 900);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.reset);
DiffForm? selected;
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: Align(
alignment: Alignment.topLeft,
child: Builder(
builder: (context) => diffFormMenu(
context,
form: DiffForm.rendered,
onChanged: (value) => selected = value,
),
),
),
),
),
);
await tester.tap(find.byTooltip('Diff form'));
await tester.pumpAndSettle();
expect(
find.byType(BottomSheet),
width < 600 ? findsOneWidget : findsNothing,
);
expect(
find.byKey(const ValueKey('app-choice-menu')),
width >= 600 ? findsOneWidget : findsNothing,
);
await tester.tap(find.text('Raw patch'));
await tester.pumpAndSettle();
expect(selected, DiffForm.raw);
expect(find.text('Raw patch'), findsNothing);
expect(tester.takeException(), isNull);
});
testWidgets('artifact details adapt to app width $width', (tester) async {
tester.view.physicalSize = Size(width, 900);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.reset);
await tester.pumpWidget(
const MaterialApp(
home: Scaffold(
body: ArtifactViewerInfoAction(
facts: Text('Recorded artifact facts'),
),
),
),
);
await tester.tap(find.byTooltip('Details'));
await tester.pumpAndSettle();
expect(find.text('Recorded artifact facts'), findsOneWidget);
expect(find.byType(Dialog), width >= 600 ? findsOneWidget : findsNothing);
expect(
find.byType(BottomSheet),
width < 600 ? findsOneWidget : findsNothing,
);
final context = tester.element(find.text('Recorded artifact facts'));
Navigator.of(context).pop();
await tester.pumpAndSettle();
expect(find.text('Recorded artifact facts'), findsNothing);
expect(tester.takeException(), isNull);
});
}
}
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -38,7 +37,6 @@ Widget _header({
label: 'Files',
onPressed: () {},
materialIcon: Icons.folder_outlined,
cupertinoIcon: CupertinoIcons.folder,
),
],
);
@@ -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/chat/conversation/chat_bar_control_style.dart';
@@ -56,7 +55,6 @@ void main() {
label: 'More action',
onPressed: () {},
materialIcon: Icons.more_horiz,
cupertinoIcon: CupertinoIcons.ellipsis,
),
],
),
@@ -206,14 +204,12 @@ void main() {
label: 'Sidebar action',
onPressed: () => sidebar++,
materialIcon: Icons.menu,
cupertinoIcon: CupertinoIcons.sidebar_left,
),
paneControls: [
ChatBarAction(
label: 'Pane action',
onPressed: () => pane++,
materialIcon: Icons.add_box,
cupertinoIcon: CupertinoIcons.plus_square,
),
],
),
@@ -15,7 +15,6 @@ void main() {
child: SizedBox.expand(
child: ChatWorkspaceEntrance(
visible: visible,
cupertino: false,
child: Material(child: child),
),
),