firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add shape property to SliverAppBar (#31662)" (#32155)

Browse Source 
This reverts commit 28b58db1f21af7ef7a913aea7971a0513d87f11b.
This commit is contained in:
Ian Hickson 2019-05-06 12:02:02 -07:00 committed by GitHub
parent fecba55888
commit b770cdf267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/flutter/lib/src/material/app_bar.dart
View File

@ -681,7 +681,6 @@ class _SliverAppBarDelegate extends SliverPersistentHeaderDelegate {
@required this.floating, @required this.floating,
@required this.pinned, @required this.pinned,
@required this.snapConfiguration, @required this.snapConfiguration,
@required this.shape,
}) : assert(primary || topPadding == 0.0), }) : assert(primary || topPadding == 0.0),
_bottomHeight = bottom?.preferredSize?.height ?? 0.0; _bottomHeight = bottom?.preferredSize?.height ?? 0.0;
@ -706,7 +705,6 @@ class _SliverAppBarDelegate extends SliverPersistentHeaderDelegate {
final double topPadding; final double topPadding;
final bool floating; final bool floating;
final bool pinned; final bool pinned;
final ShapeBorder shape;
final double _bottomHeight; final double _bottomHeight;
@ -761,7 +759,6 @@ class _SliverAppBarDelegate extends SliverPersistentHeaderDelegate {
primary: primary, primary: primary,
centerTitle: centerTitle, centerTitle: centerTitle,
titleSpacing: titleSpacing, titleSpacing: titleSpacing,
shape: shape,
toolbarOpacity: toolbarOpacity, toolbarOpacity: toolbarOpacity,
bottomOpacity: pinned ? 1.0 : (visibleMainHeight / _bottomHeight).clamp(0.0, 1.0), bottomOpacity: pinned ? 1.0 : (visibleMainHeight / _bottomHeight).clamp(0.0, 1.0),
), ),
@ -905,7 +902,6 @@ class SliverAppBar extends StatefulWidget {
this.floating = false, this.floating = false,
this.pinned = false, this.pinned = false,
this.snap = false, this.snap = false,
this.shape,
}) : assert(automaticallyImplyLeading != null), }) : assert(automaticallyImplyLeading != null),
assert(forceElevated != null), assert(forceElevated != null),
assert(primary != null), assert(primary != null),
@ -1066,12 +1062,6 @@ class SliverAppBar extends StatefulWidget {
/// Defaults to [NavigationToolbar.kMiddleSpacing]. /// Defaults to [NavigationToolbar.kMiddleSpacing].
final double titleSpacing; final double titleSpacing;
/// The material's shape as well its shadow.
///
/// A shadow is only displayed if the [elevation] is greater than
/// zero.
final ShapeBorder shape;
/// The size of the app bar when it is fully expanded. /// The size of the app bar when it is fully expanded.
/// ///
/// By default, the total height of the toolbar and the bottom widget (if /// By default, the total height of the toolbar and the bottom widget (if
@ -1225,7 +1215,6 @@ class _SliverAppBarState extends State<SliverAppBar> with TickerProviderStateMix
topPadding: topPadding, topPadding: topPadding,
floating: widget.floating, floating: widget.floating,
pinned: widget.pinned, pinned: widget.pinned,
shape: widget.shape,
snapConfiguration: _snapConfiguration, snapConfiguration: _snapConfiguration,
), ),
), ),

35
packages/flutter/test/material/app_bar_test.dart
View File

@ -1514,39 +1514,4 @@ void main() {
expect(getMaterialWidget().shape, roundedRectangleBorder); expect(getMaterialWidget().shape, roundedRectangleBorder);
}); });
testWidgets('SliverAppBar with shape', (WidgetTester tester) async {
const RoundedRectangleBorder roundedRectangleBorder = RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(15.0)),
);
await tester.pumpWidget(
MaterialApp(
home: CustomScrollView(
slivers: const <Widget>[
SliverAppBar(
leading: Text('L'),
title: Text('No Scaffold'),
shape: roundedRectangleBorder,
actions: <Widget>[Text('A1'), Text('A2')],
),
],
),
),
);
final Finder sliverAppBarFinder = find.byType(SliverAppBar);
SliverAppBar getAppBarWidget() {
return tester.widget<SliverAppBar>(sliverAppBarFinder);
}
expect(getAppBarWidget().shape, roundedRectangleBorder);
final Finder materialFinder = find.byType(Material);
Material getMaterialWidget() {
return tester.widget<Material>(materialFinder);
}
expect(getMaterialWidget().shape, roundedRectangleBorder);
});
} }