377ff04aaf
Replace the single glass pill (host NavigationBar/CupertinoTabBar with one gliding highlight) with a row of separate circular GlassPill buttons, 52/50 px with 12/10 px gaps, at the same bottom-right place. The selected button fills with the host selection tint and cross-fades; each button pops in on its own, staggered, only when the bar appears or its tabs change; presses sink like the top bar's. Tab semantics, keys, tooltips and badges are kept; the row shares one BackdropGroup for its blurs.
206 lines
7.6 KiB
Dart
206 lines
7.6 KiB
Dart
import 'package:flutter/cupertino.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:pipelines_app/shell/adaptive_shell.dart';
|
|
import 'package:pipelines_app/shell/destination.dart';
|
|
import 'package:pipelines_app/shell/detail_page.dart';
|
|
import 'package:pipelines_app/shell/list_detail.dart';
|
|
import 'package:pipelines_app/shell/shell_bar.dart';
|
|
import 'package:pipelines_app/ui/adaptive/floating_bar_layout.dart';
|
|
import 'package:pipelines_app/ui/adaptive/floating_destination_bar.dart';
|
|
import 'package:pipelines_app/ui/adaptive/glass_pill.dart';
|
|
import 'package:pipelines_app/ui/adaptive/segmented_bar.dart';
|
|
import 'package:pipelines_app/ui/adaptive/segmented_bar_overlay.dart';
|
|
|
|
/// On a wide split window (an unfolded foldable) under a system status bar,
|
|
/// every pane's bar sits below the status-bar inset while content still
|
|
/// reaches the top edge; and the open item's tabs float at the bottom of the
|
|
/// detail pane, above (never on) the shell's tab bar at the bottom right.
|
|
void main() {
|
|
const statusBar = 40.0;
|
|
|
|
Future<void> setUp(
|
|
WidgetTester tester,
|
|
Size size, {
|
|
double bottom = 0,
|
|
}) async {
|
|
tester.view.physicalSize = size;
|
|
tester.view.devicePixelRatio = 1;
|
|
tester.view.padding = FakeViewPadding(top: statusBar, bottom: bottom);
|
|
tester.view.viewPadding = FakeViewPadding(top: statusBar, bottom: bottom);
|
|
addTearDown(tester.view.reset);
|
|
}
|
|
|
|
List<Widget> rows(String label) => [
|
|
for (var index = 0; index < 40; index++)
|
|
SizedBox(height: 40, child: Text('$label $index')),
|
|
];
|
|
|
|
/// An item publishing its bar to the pane, with its own floating tabs
|
|
/// placed where the pane says (like run and pipeline detail).
|
|
Widget tabbedItem(bool cupertino) => ShellBar(
|
|
title: 'Open item',
|
|
child: Builder(
|
|
builder: (context) {
|
|
final edge = PageTabsEdge.of(context);
|
|
return FloatingBarOverlay(
|
|
edge: edge,
|
|
bar: KeyedSubtree(
|
|
key: const Key('item-tabs'),
|
|
child: FloatingDestinationBar(
|
|
cupertino: cupertino,
|
|
edge: edge,
|
|
currentIndex: 0,
|
|
onTap: (_) {},
|
|
items: const [
|
|
FloatingDestinationItem(icon: Icon(Icons.notes), label: 'One'),
|
|
FloatingDestinationItem(icon: Icon(Icons.share), label: 'Two'),
|
|
],
|
|
),
|
|
),
|
|
child: Builder(
|
|
builder: (context) => ListView(
|
|
key: const Key('item-list'),
|
|
padding: withBarClearance(context, EdgeInsets.zero),
|
|
children: rows('item'),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
);
|
|
|
|
/// An item drawing its own header over itself (like the chat thread).
|
|
Widget overlayItem(bool cupertino) => ShellBar(
|
|
barless: true,
|
|
child: SegmentedBarOverlay(
|
|
bar: SegmentedBar(
|
|
key: const Key('own-header'),
|
|
cupertino: cupertino,
|
|
automaticallyImplyLeading: false,
|
|
title: 'Own header',
|
|
),
|
|
child: ListView(key: const Key('item-list'), children: rows('item')),
|
|
),
|
|
);
|
|
|
|
Widget shell(bool cupertino, Widget Function(bool) item) {
|
|
final app = AdaptiveShell(
|
|
cupertino: cupertino,
|
|
destination: AppDestination.runs,
|
|
destinationBodies: {
|
|
AppDestination.runs: (_) => ListDetailPanes(
|
|
list: ShellBar(
|
|
child: ListView(key: const Key('list'), children: rows('list')),
|
|
),
|
|
detail: DetailPane(
|
|
destination: AppDestination.runs,
|
|
implyBack: false,
|
|
builder: (_) => item(cupertino),
|
|
),
|
|
),
|
|
},
|
|
);
|
|
return cupertino ? CupertinoApp(home: app) : MaterialApp(home: app);
|
|
}
|
|
|
|
Iterable<Rect> pillsOf(WidgetTester tester, Finder bar) => find
|
|
.descendant(of: bar, matching: find.byType(GlassPill))
|
|
.evaluate()
|
|
.map((element) {
|
|
final box = element.renderObject! as RenderBox;
|
|
return box.localToGlobal(Offset.zero) & box.size;
|
|
});
|
|
|
|
for (final cupertino in [false, true]) {
|
|
final host = cupertino ? 'Cupertino' : 'Material';
|
|
|
|
testWidgets('$host split under a status bar: list and pane bars sit '
|
|
'below it, content reaches the top edge', (tester) async {
|
|
await setUp(tester, const Size(1200, 800));
|
|
await tester.pumpWidget(shell(cupertino, tabbedItem));
|
|
await tester.pump();
|
|
await tester.pump();
|
|
|
|
final listBar = find.byWidgetPredicate(
|
|
(widget) => widget is SegmentedBar && widget.title == 'Runs',
|
|
);
|
|
final paneBar = find.byWidgetPredicate(
|
|
(widget) => widget is SegmentedBar && widget.title == 'Open item',
|
|
);
|
|
for (final bar in [listBar, paneBar]) {
|
|
final pills = pillsOf(tester, bar);
|
|
expect(pills, isNotEmpty);
|
|
for (final pill in pills) {
|
|
expect(pill.top, greaterThanOrEqualTo(statusBar));
|
|
}
|
|
}
|
|
// Content may still extend under the bars and the status bar.
|
|
expect(tester.getTopLeft(find.byKey(const Key('list'))).dy, 0);
|
|
expect(tester.getTopLeft(find.byKey(const Key('item-list'))).dy, 0);
|
|
// At rest the first rows start below the bars.
|
|
final paneBottom = pillsOf(tester, paneBar).first.bottom;
|
|
expect(
|
|
tester.getTopLeft(find.text('item 0')).dy,
|
|
greaterThanOrEqualTo(paneBottom),
|
|
);
|
|
});
|
|
|
|
testWidgets('$host split under a status bar: a self-drawn header (chat) '
|
|
'sits below it', (tester) async {
|
|
await setUp(tester, const Size(1200, 800));
|
|
await tester.pumpWidget(shell(cupertino, overlayItem));
|
|
await tester.pump();
|
|
await tester.pump();
|
|
final pills = pillsOf(tester, find.byKey(const Key('own-header')));
|
|
expect(pills, isNotEmpty);
|
|
for (final pill in pills) {
|
|
expect(pill.top, greaterThanOrEqualTo(statusBar));
|
|
}
|
|
expect(tester.getTopLeft(find.byKey(const Key('item-list'))).dy, 0);
|
|
});
|
|
|
|
testWidgets('$host split: the item tabs float above the shell tab bar '
|
|
'at the bottom right of the detail pane', (tester) async {
|
|
// A gesture-navigation inset as on the unfolded foldable.
|
|
await setUp(tester, const Size(1200, 800), bottom: 24);
|
|
await tester.pumpWidget(shell(cupertino, tabbedItem));
|
|
await tester.pump();
|
|
await tester.pump();
|
|
|
|
final body = tester.getRect(
|
|
find.byKey(const ValueKey('list-detail-body')),
|
|
);
|
|
final tabs = tester.getRect(
|
|
find.descendant(
|
|
of: find.byKey(const Key('item-tabs')),
|
|
matching: find.byKey(FloatingDestinationBar.rowKey),
|
|
),
|
|
);
|
|
expect(tabs.left, greaterThanOrEqualTo(body.left));
|
|
expect(tabs.right, lessThanOrEqualTo(body.right));
|
|
final shellTabs = tester.getRect(
|
|
find
|
|
.ancestor(
|
|
of: find.byKey(const ValueKey('shell.destination.runs')).first,
|
|
matching: find.byKey(FloatingDestinationBar.rowKey),
|
|
)
|
|
.first,
|
|
);
|
|
// The shell's bar keeps the bottom right, above the system inset; the
|
|
// item's tabs sit a gap above it, both at the trailing edge.
|
|
expect(shellTabs.bottom, closeTo(800 - 24, 0.5));
|
|
expect(shellTabs.right, closeTo(1200 - kFloatingBarMargin, 0.5));
|
|
expect(tabs.right, closeTo(1200 - kFloatingBarMargin, 0.5));
|
|
expect(shellTabs.overlaps(tabs), isFalse);
|
|
expect(shellTabs.top - tabs.bottom, closeTo(kStackedBarGap, 0.5));
|
|
// The item's list clears its tabs at rest.
|
|
final list = tester.element(find.byKey(const Key('item-list')));
|
|
expect(
|
|
MediaQuery.paddingOf(list).bottom,
|
|
greaterThanOrEqualTo(800 - tabs.top),
|
|
);
|
|
});
|
|
}
|
|
}
|