Skip to content

F
Front-End
Unverified Commit ea26272e authored by Kate Lovett's avatar Kate Lovett Committed by GitHub
Browse files
Options

Revert "Fix reverse cases for App Bar scrolled under behavior (#101460)" (#101929) 

merging now since it blocks flutter roll for too long
parent c579bbde
Show whitespace changes
Inline Side-by-side
Showing with 305 additions and 671 deletions
packages/flutter/lib/src/material/app_bar.dart
View file @ ea26272e
...@@ -736,24 +736,24 @@ class _AppBarState extends State<AppBar> { ...@@ -736,24 +736,24 @@ class _AppBarState extends State<AppBar> {
static const double _defaultElevation = 4.0; static const double _defaultElevation = 4.0;
static const Color _defaultShadowColor = Color(0xFF000000); static const Color _defaultShadowColor = Color(0xFF000000);
ScrollMetricsNotificationObserverState? _scrollMetricsNotificationObserver; ScrollNotificationObserverState? _scrollNotificationObserver;
bool _scrolledUnder = false; bool _scrolledUnder = false;
@override @override
void didChangeDependencies() { void didChangeDependencies() {
super.didChangeDependencies(); super.didChangeDependencies();
if (_scrollMetricsNotificationObserver != null) if (_scrollNotificationObserver != null)
_scrollMetricsNotificationObserver!.removeListener(_handleScrollMetricsNotification); _scrollNotificationObserver!.removeListener(_handleScrollNotification);
_scrollMetricsNotificationObserver = ScrollMetricsNotificationObserver.of(context); _scrollNotificationObserver = ScrollNotificationObserver.of(context);
if (_scrollMetricsNotificationObserver != null) if (_scrollNotificationObserver != null)
_scrollMetricsNotificationObserver!.addListener(_handleScrollMetricsNotification); _scrollNotificationObserver!.addListener(_handleScrollNotification);
} }
@override @override
void dispose() { void dispose() {
if (_scrollMetricsNotificationObserver != null) { if (_scrollNotificationObserver != null) {
_scrollMetricsNotificationObserver!.removeListener(_handleScrollMetricsNotification); _scrollNotificationObserver!.removeListener(_handleScrollNotification);
_scrollMetricsNotificationObserver = null; _scrollNotificationObserver = null;
} }
super.dispose(); super.dispose();
} }
...@@ -766,35 +766,19 @@ class _AppBarState extends State<AppBar> { ...@@ -766,35 +766,19 @@ class _AppBarState extends State<AppBar> {
Scaffold.of(context).openEndDrawer(); Scaffold.of(context).openEndDrawer();
} }
void _handleScrollMetricsNotification(ScrollMetricsNotification notification) { void _handleScrollNotification(ScrollNotification notification) {
if (notification is ScrollUpdateNotification) {
final bool oldScrolledUnder = _scrolledUnder; final bool oldScrolledUnder = _scrolledUnder;
final ScrollMetrics metrics = notification.metrics; _scrolledUnder = notification.depth == 0
&& notification.metrics.extentBefore > 0
if (notification.depth != 0) { && notification.metrics.axis == Axis.vertical;
_scrolledUnder = false;
} else {
switch (metrics.axisDirection) {
case AxisDirection.up:
// Scroll view is reversed
_scrolledUnder = metrics.extentAfter > 0;
break;
case AxisDirection.down:
_scrolledUnder = metrics.extentBefore > 0;
break;
case AxisDirection.right:
case AxisDirection.left:
// Scrolled under is only supported in the vertical axis.
_scrolledUnder = false;
break;
}
}
if (_scrolledUnder != oldScrolledUnder) { if (_scrolledUnder != oldScrolledUnder) {
setState(() { setState(() {
// React to a change in MaterialState.scrolledUnder // React to a change in MaterialState.scrolledUnder
}); });
} }
} }
}
Color _resolveColor(Set<MaterialState> states, Color? widgetColor, Color? themeColor, Color defaultColor) { Color _resolveColor(Set<MaterialState> states, Color? widgetColor, Color? themeColor, Color defaultColor) {
return MaterialStateProperty.resolveAs<Color?>(widgetColor, states) return MaterialStateProperty.resolveAs<Color?>(widgetColor, states)
......
packages/flutter/lib/src/material/scaffold.dart
View file @ ea26272e
...@@ -2831,7 +2831,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto ...@@ -2831,7 +2831,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin, Resto
return _ScaffoldScope( return _ScaffoldScope(
hasDrawer: hasDrawer, hasDrawer: hasDrawer,
geometryNotifier: _geometryNotifier, geometryNotifier: _geometryNotifier,
child: ScrollMetricsNotificationObserver( child: ScrollNotificationObserver(
child: Material( child: Material(
color: widget.backgroundColor ?? themeData.scaffoldBackgroundColor, color: widget.backgroundColor ?? themeData.scaffoldBackgroundColor,
child: AnimatedBuilder(animation: _floatingActionButtonMoveController, builder: (BuildContext context, Widget? child) { child: AnimatedBuilder(animation: _floatingActionButtonMoveController, builder: (BuildContext context, Widget? child) {
......
packages/flutter/lib/src/widgets/scroll_notification_observer.dart
View file @ ea26272e
...@@ -9,7 +9,6 @@ import 'package:flutter/foundation.dart'; ...@@ -9,7 +9,6 @@ import 'package:flutter/foundation.dart';
import 'framework.dart'; import 'framework.dart';
import 'notification_listener.dart'; import 'notification_listener.dart';
import 'scroll_notification.dart'; import 'scroll_notification.dart';
import 'scroll_position.dart';
/// A [ScrollNotification] listener for [ScrollNotificationObserver]. /// A [ScrollNotification] listener for [ScrollNotificationObserver].
/// ///
...@@ -171,168 +170,3 @@ class ScrollNotificationObserverState extends State<ScrollNotificationObserver> ...@@ -171,168 +170,3 @@ class ScrollNotificationObserverState extends State<ScrollNotificationObserver>
super.dispose(); super.dispose();
} }
} }
/// A [ScrollMetricsNotification] listener for [ScrollMetricsNotificationObserver].
///
/// [ScrollMetricsNotificationObserver] is similar to
/// [NotificationListener]. It supports a listener list instead of
/// just a single listener and its listeners run unconditionally, they
/// do not require a gating boolean return value.
typedef ScrollMetricsNotificationCallback = void Function(ScrollMetricsNotification notification);
class _ScrollMetricsNotificationObserverScope extends InheritedWidget {
const _ScrollMetricsNotificationObserverScope({
required super.child,
required ScrollMetricsNotificationObserverState scrollMetricsNotificationObserverState,
}) : _scrollMetricsNotificationObserverState = scrollMetricsNotificationObserverState;
final ScrollMetricsNotificationObserverState _scrollMetricsNotificationObserverState;
@override
bool updateShouldNotify(_ScrollMetricsNotificationObserverScope old) {
return _scrollMetricsNotificationObserverState != old._scrollMetricsNotificationObserverState;
}
}
class _MetricsListenerEntry extends LinkedListEntry<_MetricsListenerEntry> {
_MetricsListenerEntry(this.listener);
final ScrollMetricsNotificationCallback listener;
}
/// Notifies its listeners when a descendant ScrollMetrics are
/// initialized or updated.
///
/// To add a listener to a [ScrollMetricsNotificationObserver] ancestor:
/// ```dart
/// void listener(ScrollMetricsNotification notification) {
/// // Do something, maybe setState()
/// }
/// ScrollMetricsNotificationObserver.of(context).addListener(listener)
/// ```
///
/// To remove the listener from a [ScrollMetricsNotificationObserver] ancestor:
/// ```dart
/// ScrollMetricsNotificationObserver.of(context).removeListener(listener);
/// ```
///
/// Stateful widgets that share an ancestor [ScrollMetricsNotificationObserver]
/// typically add a listener in [State.didChangeDependencies] (removing the old
/// one if necessary) and remove the listener in their [State.dispose] method.
///
/// This widget is similar to [NotificationListener]. It supports
/// a listener list instead of just a single listener and its listeners
/// run unconditionally, they do not require a gating boolean return value.
class ScrollMetricsNotificationObserver extends StatefulWidget {
/// Create a [ScrollMetricsNotificationObserver].
///
/// The [child] parameter must not be null.
const ScrollMetricsNotificationObserver({
super.key,
required this.child,
}) : assert(child != null);
/// The subtree below this widget.
final Widget child;
/// The closest instance of this class that encloses the given context.
///
/// If there is no enclosing [ScrollMetricsNotificationObserver] widget, then
/// null is returned.
static ScrollMetricsNotificationObserverState? of(BuildContext context) {
return context.dependOnInheritedWidgetOfExactType<_ScrollMetricsNotificationObserverScope>()?._scrollMetricsNotificationObserverState;
}
@override
ScrollMetricsNotificationObserverState createState() => ScrollMetricsNotificationObserverState();
}
/// The listener list state for a [ScrollMetricsNotificationObserver] returned
/// by [ScrollMetricsNotificationObserver.of].
///
/// [ScrollMetricsNotificationObserver] is similar to
/// [NotificationListener]. It supports a listener list instead of
/// just a single listener and its listeners run unconditionally, they
/// do not require a gating boolean return value.
class ScrollMetricsNotificationObserverState extends State<ScrollMetricsNotificationObserver> {
LinkedList<_MetricsListenerEntry>? _listeners = LinkedList<_MetricsListenerEntry>();
bool _debugAssertNotDisposed() {
assert(() {
if (_listeners == null) {
throw FlutterError(
'A $runtimeType was used after being disposed.\n'
'Once you have called dispose() on a $runtimeType, it can no longer be used.',
);
}
return true;
}());
return true;
}
/// Add a [ScrollMetricsNotificationCallback] that will be called each time
/// a descendant scrolls.
void addListener(ScrollMetricsNotificationCallback listener) {
assert(_debugAssertNotDisposed());
_listeners!.add(_MetricsListenerEntry(listener));
}
/// Remove the specified [ScrollMetricsNotificationCallback].
void removeListener(ScrollMetricsNotificationCallback listener) {
assert(_debugAssertNotDisposed());
for (final _MetricsListenerEntry entry in _listeners!) {
if (entry.listener == listener) {
entry.unlink();
return;
}
}
}
void _notifyListeners(ScrollMetricsNotification notification) {
assert(_debugAssertNotDisposed());
if (_listeners!.isEmpty)
return;
final List<_MetricsListenerEntry> localListeners = List<_MetricsListenerEntry>.of(_listeners!);
for (final _MetricsListenerEntry entry in localListeners) {
try {
if (entry.list != null)
entry.listener(notification);
} catch (exception, stack) {
FlutterError.reportError(FlutterErrorDetails(
exception: exception,
stack: stack,
library: 'widget library',
context: ErrorDescription('while dispatching notifications for $runtimeType'),
informationCollector: () => <DiagnosticsNode>[
DiagnosticsProperty<ScrollMetricsNotificationObserverState>(
'The $runtimeType sending notification was',
this,
style: DiagnosticsTreeStyle.errorProperty,
),
],
));
}
}
}
@override
Widget build(BuildContext context) {
return NotificationListener<ScrollMetricsNotification>(
onNotification: (ScrollMetricsNotification notification) {
_notifyListeners(notification);
return false;
},
child: _ScrollMetricsNotificationObserverScope(
scrollMetricsNotificationObserverState: this,
child: widget.child,
),
);
}
@override
void dispose() {
assert(_debugAssertNotDisposed());
_listeners = null;
super.dispose();
}
}
packages/flutter/test/material/app_bar_test.dart
View file @ ea26272e
...@@ -2567,63 +2567,47 @@ void main() { ...@@ -2567,63 +2567,47 @@ void main() {
expect(actionIconTheme.color, foregroundColor); expect(actionIconTheme.color, foregroundColor);
}); });
group('MaterialStateColor scrolledUnder', () { testWidgets('SliverAppBar.backgroundColor MaterialStateColor scrolledUnder', (WidgetTester tester) async {
const double collapsedHeight = kToolbarHeight; const double collapsedHeight = kToolbarHeight;
const double expandedHeight = 200.0; const double expandedHeight = 200.0;
const Color scrolledColor = Color(0xff00ff00); const Color scrolledColor = Color(0xff00ff00);
const Color defaultColor = Color(0xff0000ff); const Color defaultColor = Color(0xff0000ff);
Finder findAppBarMaterial() { await tester.pumpWidget(
return find.descendant(of: find.byType(AppBar), matching: find.byType(Material)).first; MaterialApp(
}
Color? getAppBarBackgroundColor(WidgetTester tester) {
return tester.widget<Material>(findAppBarMaterial()).color;
}
group('SliverAppBar', () {
Widget _buildSliverApp({
required double contentHeight,
bool reverse = false,
bool includeFlexibleSpace = false,
}) {
return MaterialApp(
home: Scaffold( home: Scaffold(
body: CustomScrollView( body: CustomScrollView(
reverse: reverse,
slivers: <Widget>[ slivers: <Widget>[
SliverAppBar( SliverAppBar(
elevation: 0, elevation: 0,
backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) { backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) {
return states.contains(MaterialState.scrolledUnder) return states.contains(MaterialState.scrolledUnder) ? scrolledColor : defaultColor;
? scrolledColor
: defaultColor;
}), }),
expandedHeight: expandedHeight, expandedHeight: expandedHeight,
pinned: true, pinned: true,
flexibleSpace: includeFlexibleSpace
? const FlexibleSpaceBar(title: Text('SliverAppBar'))
: null,
), ),
SliverList( SliverList(
delegate: SliverChildListDelegate( delegate: SliverChildListDelegate(
<Widget>[ <Widget>[
Container(height: contentHeight, color: Colors.teal), Container(height: 1200.0, color: Colors.teal),
], ],
), ),
), ),
], ],
), ),
), ),
),
); );
Finder findAppBarMaterial() {
return find.descendant(of: find.byType(AppBar), matching: find.byType(Material));
} }
testWidgets('backgroundColor', (WidgetTester tester) async { Color? getAppBarBackgroundColor() {
await tester.pumpWidget( return tester.widget<Material>(findAppBarMaterial()).color;
_buildSliverApp(contentHeight: 1200.0) }
);
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight); expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0)); TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
...@@ -2631,7 +2615,7 @@ void main() { ...@@ -2631,7 +2615,7 @@ void main() {
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor); expect(getAppBarBackgroundColor(), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, collapsedHeight); expect(tester.getSize(findAppBarMaterial()).height, collapsedHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0)); gesture = await tester.startGesture(const Offset(50.0, 300.0));
...@@ -2639,193 +2623,107 @@ void main() { ...@@ -2639,193 +2623,107 @@ void main() {
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight); expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
}); });
testWidgets('backgroundColor with FlexibleSpace', (WidgetTester tester) async { testWidgets('SliverAppBar.backgroundColor with FlexibleSpace MaterialStateColor scrolledUnder', (WidgetTester tester) async {
await tester.pumpWidget( const double collapsedHeight = kToolbarHeight;
_buildSliverApp(contentHeight: 1200.0, includeFlexibleSpace: true) const double expandedHeight = 200.0;
); const Color scrolledColor = Color(0xff00ff00);
const Color defaultColor = Color(0xff0000ff);
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, -expandedHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, collapsedHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0));
await gesture.moveBy(const Offset(0.0, expandedHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
});
testWidgets('backgroundColor - reverse', (WidgetTester tester) async {
await tester.pumpWidget( await tester.pumpWidget(
_buildSliverApp(contentHeight: 1200.0, reverse: true) MaterialApp(
home: Scaffold(
body: CustomScrollView(
slivers: <Widget>[
SliverAppBar(
elevation: 0,
backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) {
return states.contains(MaterialState.scrolledUnder) ? scrolledColor : defaultColor;
}),
expandedHeight: expandedHeight,
pinned: true,
flexibleSpace: const FlexibleSpaceBar(
title: Text('SliverAppBar'),
),
),
SliverList(
delegate: SliverChildListDelegate(
<Widget>[
Container(height: 1200.0, color: Colors.teal),
],
),
),
],
),
),
),
); );
expect(getAppBarBackgroundColor(tester), defaultColor); Finder findAppBarMaterial() {
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight); // There are 2 Material widgets below AppBar. The second is only added if
// flexibleSpace is non-null.
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0)); return find.descendant(of: find.byType(AppBar), matching: find.byType(Material)).first;
await gesture.moveBy(const Offset(0.0, expandedHeight)); }
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, collapsedHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0));
await gesture.moveBy(const Offset(0.0, -expandedHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
});
testWidgets('backgroundColor with FlexibleSpace - reverse', (WidgetTester tester) async { Color? getAppBarBackgroundColor() {
await tester.pumpWidget( return tester.widget<Material>(findAppBarMaterial()).color;
_buildSliverApp( }
contentHeight: 1200.0,
reverse: true,
includeFlexibleSpace: true,
)
);
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight); expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0)); TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, expandedHeight)); await gesture.moveBy(const Offset(0.0, -expandedHeight));
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor); expect(getAppBarBackgroundColor(), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, collapsedHeight); expect(tester.getSize(findAppBarMaterial()).height, collapsedHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0)); gesture = await tester.startGesture(const Offset(50.0, 300.0));
await gesture.moveBy(const Offset(0.0, -expandedHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
});
testWidgets('backgroundColor - not triggered in reverse for short content', (WidgetTester tester) async {
await tester.pumpWidget(
_buildSliverApp(contentHeight: 200, reverse: true)
);
// In reverse, the content here is not long enough to scroll under the app
// bar.
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
final TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, expandedHeight)); await gesture.moveBy(const Offset(0.0, expandedHeight));
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight); expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
}); });
testWidgets('backgroundColor with FlexibleSpace - not triggered in reverse for short content', (WidgetTester tester) async { testWidgets('AppBar.backgroundColor MaterialStateColor scrolledUnder', (WidgetTester tester) async {
await tester.pumpWidget( const Color scrolledColor = Color(0xff00ff00);
_buildSliverApp( const Color defaultColor = Color(0xff0000ff);
contentHeight: 200,
reverse: true,
includeFlexibleSpace: true,
)
);
// In reverse, the content here is not long enough to scroll under the app
// bar.
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
final TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, expandedHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, expandedHeight);
});
});
group('AppBar', () { await tester.pumpWidget(
Widget _buildAppBar({ MaterialApp(
required double contentHeight,
bool reverse = false,
bool includeFlexibleSpace = false
}) {
return MaterialApp(
home: Scaffold( home: Scaffold(
appBar: AppBar( appBar: AppBar(
elevation: 0, elevation: 0,
backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) { backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) {
return states.contains(MaterialState.scrolledUnder) return states.contains(MaterialState.scrolledUnder) ? scrolledColor : defaultColor;
? scrolledColor
: defaultColor;
}), }),
title: const Text('AppBar'), title: const Text('AppBar'),
flexibleSpace: includeFlexibleSpace
? const FlexibleSpaceBar(title: Text('FlexibleSpace'))
: null,
), ),
body: ListView( body: ListView(
reverse: reverse,
children: <Widget>[ children: <Widget>[
Container(height: contentHeight, color: Colors.teal), Container(height: 1200.0, color: Colors.teal),
], ],
), ),
), ),
); ),
}
testWidgets('backgroundColor', (WidgetTester tester) async {
await tester.pumpWidget(
_buildAppBar(contentHeight: 1200.0)
); );
expect(getAppBarBackgroundColor(tester), defaultColor); Finder findAppBarMaterial() {
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight); return find.descendant(of: find.byType(AppBar), matching: find.byType(Material));
}
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, -kToolbarHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0));
await gesture.moveBy(const Offset(0.0, kToolbarHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
});
testWidgets('backgroundColor with FlexibleSpace', (WidgetTester tester) async { Color? getAppBarBackgroundColor() {
await tester.pumpWidget( return tester.widget<Material>(findAppBarMaterial()).color;
_buildAppBar(contentHeight: 1200.0, includeFlexibleSpace: true) }
);
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight); expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0)); TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
...@@ -2833,7 +2731,7 @@ void main() { ...@@ -2833,7 +2731,7 @@ void main() {
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor); expect(getAppBarBackgroundColor(), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight); expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0)); gesture = await tester.startGesture(const Offset(50.0, 300.0));
...@@ -2841,109 +2739,67 @@ void main() { ...@@ -2841,109 +2739,67 @@ void main() {
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight); expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
}); });
testWidgets('backgroundColor - reverse', (WidgetTester tester) async { testWidgets('AppBar.backgroundColor with FlexibleSpace MaterialStateColor scrolledUnder', (WidgetTester tester) async {
await tester.pumpWidget( const Color scrolledColor = Color(0xff00ff00);
_buildAppBar(contentHeight: 1200.0, reverse: true) const Color defaultColor = Color(0xff0000ff);
);
await tester.pump();
// In this test case, the content always extends under the AppBar, so it
// should always be the scrolledColor.
expect(getAppBarBackgroundColor(tester), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, kToolbarHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0));
await gesture.moveBy(const Offset(0.0, -kToolbarHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
});
// Regression test for https://github.com/flutter/flutter/issues/80256
testWidgets('The second page should have a back button even it has a end drawer', (WidgetTester tester) async {
final Page<void> page1 = MaterialPage<void>(
key: const ValueKey<String>('1'),
child: Scaffold(
key: const ValueKey<String>('1'),
appBar: AppBar(),
endDrawer: const Drawer(),
)
);
final Page<void> page2 = MaterialPage<void>(
key: const ValueKey<String>('2'),
child: Scaffold(
key: const ValueKey<String>('2'),
appBar: AppBar(),
endDrawer: const Drawer(),
)
);
final List<Page<void>> pages = <Page<void>>[ page1, page2 ];
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Navigator( home: Scaffold(
pages: pages, appBar: AppBar(
onPopPage: (Route<Object?> route, Object? result) => false, elevation: 0,
backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) {
return states.contains(MaterialState.scrolledUnder) ? scrolledColor : defaultColor;
}),
title: const Text('AppBar'),
flexibleSpace: const FlexibleSpaceBar(
title: Text('FlexibleSpace'),
),
),
body: ListView(
children: <Widget>[
Container(height: 1200.0, color: Colors.teal),
],
), ),
), ),
);
// The page2 should have a back button.
expect(
find.descendant(
of: find.byKey(const ValueKey<String>('2')),
matching: find.byType(BackButton),
), ),
findsOneWidget
); );
});
testWidgets('backgroundColor with FlexibleSpace - reverse', (WidgetTester tester) async { Finder findAppBarMaterial() {
await tester.pumpWidget( // There are 2 Material widgets below AppBar. The second is only added if
_buildAppBar( // flexibleSpace is non-null.
contentHeight: 1200.0, return find.descendant(of: find.byType(AppBar), matching: find.byType(Material)).first;
reverse: true, }
includeFlexibleSpace: true,
) Color? getAppBarBackgroundColor() {
); return tester.widget<Material>(findAppBarMaterial()).color;
await tester.pump(); }
// In this test case, the content always extends under the AppBar, so it expect(getAppBarBackgroundColor(), defaultColor);
// should always be the scrolledColor.
expect(getAppBarBackgroundColor(tester), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight); expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0)); TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, kToolbarHeight)); await gesture.moveBy(const Offset(0.0, -kToolbarHeight));
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor); expect(getAppBarBackgroundColor(), scrolledColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight); expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
gesture = await tester.startGesture(const Offset(50.0, 300.0)); gesture = await tester.startGesture(const Offset(50.0, 300.0));
await gesture.moveBy(const Offset(0.0, -kToolbarHeight)); await gesture.moveBy(const Offset(0.0, kToolbarHeight));
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), scrolledColor); expect(getAppBarBackgroundColor(), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight); expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
}); });
testWidgets('_handleScrollMetricsNotification safely calls setState()', (WidgetTester tester) async { testWidgets('AppBar._handleScrollNotification safely calls setState()', (WidgetTester tester) async {
// Regression test for failures found in Google internal issue b/185192049. // Regression test for failures found in Google internal issue b/185192049.
final ScrollController controller = ScrollController(initialScrollOffset: 400); final ScrollController controller = ScrollController(initialScrollOffset: 400);
await tester.pumpWidget( await tester.pumpWidget(
...@@ -2969,16 +2825,17 @@ void main() { ...@@ -2969,16 +2825,17 @@ void main() {
expect(tester.takeException(), isNull); expect(tester.takeException(), isNull);
}); });
testWidgets('does not trigger on horizontal scroll', (WidgetTester tester) async { testWidgets('AppBar scrolledUnder does not trigger on horizontal scroll', (WidgetTester tester) async {
const Color scrolledColor = Color(0xff00ff00);
const Color defaultColor = Color(0xff0000ff);
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Scaffold( home: Scaffold(
appBar: AppBar( appBar: AppBar(
elevation: 0, elevation: 0,
backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) { backgroundColor: MaterialStateColor.resolveWith((Set<MaterialState> states) {
return states.contains(MaterialState.scrolledUnder) return states.contains(MaterialState.scrolledUnder) ? scrolledColor : defaultColor;
? scrolledColor
: defaultColor;
}), }),
title: const Text('AppBar'), title: const Text('AppBar'),
), ),
...@@ -2992,70 +2849,29 @@ void main() { ...@@ -2992,70 +2849,29 @@ void main() {
), ),
); );
expect(getAppBarBackgroundColor(tester), defaultColor); Finder findAppBarMaterial() {
return find.descendant(of: find.byType(AppBar), matching: find.byType(Material));
}
Color? getAppBarBackgroundColor() {
return tester.widget<Material>(findAppBarMaterial()).color;
}
expect(getAppBarBackgroundColor(), defaultColor);
TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0)); TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(-100.0, 0.0)); await gesture.moveBy(const Offset(-100.0, 0.0));
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
gesture = await tester.startGesture(const Offset(50.0, 400.0)); gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(100.0, 0.0)); await gesture.moveBy(const Offset(100.0, 0.0));
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor); expect(getAppBarBackgroundColor(), defaultColor);
});
testWidgets('backgroundColor - not triggered in reverse for short content', (WidgetTester tester) async {
await tester.pumpWidget(
_buildAppBar(
contentHeight: 200.0,
reverse: true,
)
);
await tester.pump();
// In reverse, the content here is not long enough to scroll under the app
// bar.
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
final TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, kToolbarHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
});
testWidgets('backgroundColor with FlexibleSpace - not triggered in reverse for short content', (WidgetTester tester) async {
await tester.pumpWidget(
_buildAppBar(
contentHeight: 200.0,
reverse: true,
includeFlexibleSpace: true,
)
);
await tester.pump();
// In reverse, the content here is not long enough to scroll under the app
// bar.
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
final TestGesture gesture = await tester.startGesture(const Offset(50.0, 400.0));
await gesture.moveBy(const Offset(0.0, kToolbarHeight));
await gesture.up();
await tester.pumpAndSettle();
expect(getAppBarBackgroundColor(tester), defaultColor);
expect(tester.getSize(findAppBarMaterial()).height, kToolbarHeight);
});
});
}); });
testWidgets('AppBar.preferredHeightFor', (WidgetTester tester) async { testWidgets('AppBar.preferredHeightFor', (WidgetTester tester) async {
......
packages/flutter/test/material/debug_test.dart
View file @ ea26272e
...@@ -344,9 +344,9 @@ void main() { ...@@ -344,9 +344,9 @@ void main() {
' PhysicalModel\n' ' PhysicalModel\n'
' AnimatedPhysicalModel\n' ' AnimatedPhysicalModel\n'
' Material\n' ' Material\n'
' _ScrollMetricsNotificationObserverScope\n' ' _ScrollNotificationObserverScope\n'
' NotificationListener<ScrollMetricsNotification>\n' ' NotificationListener<ScrollNotification>\n'
' ScrollMetricsNotificationObserver\n' ' ScrollNotificationObserver\n'
' _ScaffoldScope\n' ' _ScaffoldScope\n'
' Scaffold-[LabeledGlobalKey<ScaffoldState>#00000]\n' ' Scaffold-[LabeledGlobalKey<ScaffoldState>#00000]\n'
' MediaQuery\n' ' MediaQuery\n'
......
packages/flutter/test/material/scaffold_test.dart
View file @ ea26272e
...@@ -2302,9 +2302,9 @@ void main() { ...@@ -2302,9 +2302,9 @@ void main() {
' PhysicalModel\n' ' PhysicalModel\n'
' AnimatedPhysicalModel\n' ' AnimatedPhysicalModel\n'
' Material\n' ' Material\n'
' _ScrollMetricsNotificationObserverScope\n' ' _ScrollNotificationObserverScope\n'
' NotificationListener<ScrollMetricsNotification>\n' ' NotificationListener<ScrollNotification>\n'
' ScrollMetricsNotificationObserver\n' ' ScrollNotificationObserver\n'
' _ScaffoldScope\n' ' _ScaffoldScope\n'
' Scaffold\n' ' Scaffold\n'
' MediaQuery\n' ' MediaQuery\n'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab