development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 19:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional float location case (#61171)

Browse source
This commit is contained in:
Kate Lovett 2020-07-09 14:06:03 -07:00 committed by GitHub
parent f32a73711a
commit e3079a3339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 209 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/flutter/lib/src/material/floating_action_button_location.dart
View file

@ -443,12 +443,13 @@ mixin FabFloatOffsetY on StandardFabLocation {
@override @override
double getOffsetY(ScaffoldPrelayoutGeometry scaffoldGeometry, double adjustment) { double getOffsetY(ScaffoldPrelayoutGeometry scaffoldGeometry, double adjustment) {
final double contentBottom = scaffoldGeometry.contentBottom; final double contentBottom = scaffoldGeometry.contentBottom;
final double bottomContentHeight = scaffoldGeometry.scaffoldSize.height - contentBottom;
final double bottomSheetHeight = scaffoldGeometry.bottomSheetSize.height; final double bottomSheetHeight = scaffoldGeometry.bottomSheetSize.height;
final double fabHeight = scaffoldGeometry.floatingActionButtonSize.height; final double fabHeight = scaffoldGeometry.floatingActionButtonSize.height;
final double snackBarHeight = scaffoldGeometry.snackBarSize.height; final double snackBarHeight = scaffoldGeometry.snackBarSize.height;
final double safeMargin = math.max( final double safeMargin = math.max(
kFloatingActionButtonMargin, kFloatingActionButtonMargin,
scaffoldGeometry.minViewPadding.bottom, scaffoldGeometry.minViewPadding.bottom - bottomContentHeight,
); );
double fabY = contentBottom - fabHeight - safeMargin; double fabY = contentBottom - fabHeight - safeMargin;

273
packages/flutter/test/material/floating_action_button_location_test.dart
View file

@ -667,20 +667,26 @@ void main() {
// Test float locations, for each (6), keyboard presented or not: // Test float locations, for each (6), keyboard presented or not:
// - Default // - Default
// - with resizeToAvoidBottomInset: false // - with resizeToAvoidBottomInset: false
// - with BottomNavigationBar
// - with BottomNavigationBar and resizeToAvoidBottomInset: false
// - with BottomNavigationBar & BottomSheet
// - with BottomNavigationBar & BottomSheet, resizeToAvoidBottomInset: false
// - with BottomSheet // - with BottomSheet
// - with BottomSheet and resizeToAvoidBottomInset: false // - with BottomSheet and resizeToAvoidBottomInset: false
// - with SnackBar // - with SnackBar
Future<void> _runFloatTests( Future<void> _runFloatTests(
WidgetTester tester, WidgetTester tester,
FloatingActionButtonLocation location, FloatingActionButtonLocation location, {
Rect defaultRect, Rect defaultRect,
Rect bottomNavigationBarRect,
Rect bottomSheetRect, Rect bottomSheetRect,
Rect snackBarRect, { Rect snackBarRect,
bool mini = false, bool mini = false,
}) async { }) async {
const double keyboardHeight = 200.0; const double keyboardHeight = 200.0;
const double viewPadding = 50.0; const double viewPadding = 50.0;
final Key floatingActionButton = UniqueKey(); final Key floatingActionButton = UniqueKey();
const double bottomNavHeight = 99.0;
// Default // Default
await tester.pumpWidget(_buildTest( await tester.pumpWidget(_buildTest(
location, location,
@ -727,6 +733,123 @@ void main() {
rectMoreOrLessEquals(defaultRect), rectMoreOrLessEquals(defaultRect),
); );
// BottomNavigationBar default
await tester.pumpWidget(_buildTest(
location,
const MediaQueryData(
padding: EdgeInsets.only(bottom: viewPadding),
viewPadding: EdgeInsets.only(bottom: viewPadding),
),
floatingActionButton,
bottomNavigationBar: true,
mini: mini,
));
expect(
tester.getRect(find.byKey(floatingActionButton)),
rectMoreOrLessEquals(bottomNavigationBarRect),
);
// Present keyboard and check position, FAB position changes
await tester.pumpWidget(_buildTest(
location,
const MediaQueryData(
padding: EdgeInsets.only(bottom: viewPadding),
viewPadding: EdgeInsets.only(bottom: viewPadding),
viewInsets: EdgeInsets.only(bottom: keyboardHeight),
),
floatingActionButton,
bottomNavigationBar: true,
mini: mini,
));
expect(
tester.getRect(find.byKey(floatingActionButton)),
rectMoreOrLessEquals(bottomNavigationBarRect.translate(
0.0,
-keyboardHeight + bottomNavHeight,
)),
);
// BottomNavigationBar with resizeToAvoidBottomInset: false
// With keyboard presented, should maintain default position
await tester.pumpWidget(_buildTest(
location,
const MediaQueryData(
padding: EdgeInsets.only(bottom: viewPadding),
viewPadding: EdgeInsets.only(bottom: viewPadding),
viewInsets: EdgeInsets.only(bottom: keyboardHeight)
),
floatingActionButton,
bottomNavigationBar: true,
resizeToAvoidBottomInset: false,
mini: mini,
));
expect(
tester.getRect(find.byKey(floatingActionButton)),
rectMoreOrLessEquals(bottomNavigationBarRect),
);
// BottomNavigationBar + BottomSheet default
await tester.pumpWidget(_buildTest(
location,
const MediaQueryData(
padding: EdgeInsets.only(bottom: viewPadding),
viewPadding: EdgeInsets.only(bottom: viewPadding),
),
floatingActionButton,
bottomNavigationBar: true,
bottomSheet: true,
mini: mini,
));
expect(
tester.getRect(find.byKey(floatingActionButton)),
rectMoreOrLessEquals(bottomSheetRect.translate(
0.0,
-bottomNavHeight,
)),
);
// Present keyboard and check position, FAB position changes
await tester.pumpWidget(_buildTest(
location,
const MediaQueryData(
padding: EdgeInsets.only(bottom: viewPadding),
viewPadding: EdgeInsets.only(bottom: viewPadding),
viewInsets: EdgeInsets.only(bottom: keyboardHeight),
),
floatingActionButton,
bottomNavigationBar: true,
bottomSheet: true,
mini: mini,
));
expect(
tester.getRect(find.byKey(floatingActionButton)),
rectMoreOrLessEquals(bottomSheetRect.translate(
0.0,
-keyboardHeight,
)),
);
// BottomNavigationBar + BottomSheet with resizeToAvoidBottomInset: false
// With keyboard presented, should maintain default position
await tester.pumpWidget(_buildTest(
location,
const MediaQueryData(
padding: EdgeInsets.only(bottom: viewPadding),
viewPadding: EdgeInsets.only(bottom: viewPadding),
viewInsets: EdgeInsets.only(bottom: keyboardHeight)
),
floatingActionButton,
bottomNavigationBar: true,
bottomSheet: true,
resizeToAvoidBottomInset: false,
mini: mini,
));
expect(
tester.getRect(find.byKey(floatingActionButton)),
rectMoreOrLessEquals(bottomSheetRect.translate(
0.0,
-bottomNavHeight,
)),
);
// BottomSheet default // BottomSheet default
await tester.pumpWidget(_buildTest( await tester.pumpWidget(_buildTest(
location, location,
@ -807,6 +930,8 @@ void main() {
testWidgets('startFloat', (WidgetTester tester) async { testWidgets('startFloat', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(16.0, 494.0, 72.0, 550.0); const Rect defaultRect = Rect.fromLTRB(16.0, 494.0, 72.0, 550.0);
// Positioned relative to BottomNavigationBar
const Rect bottomNavigationBarRect = Rect.fromLTRB(16.0, 429.0, 72.0, 485.0);
// Position relative to BottomSheet // Position relative to BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(16.0, 472.0, 72.0, 528.0); const Rect bottomSheetRect = Rect.fromLTRB(16.0, 472.0, 72.0, 528.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -814,14 +939,17 @@ void main() {
await _runFloatTests( await _runFloatTests(
tester, tester,
FloatingActionButtonLocation.startFloat, FloatingActionButtonLocation.startFloat,
defaultRect, defaultRect: defaultRect,
bottomSheetRect, bottomNavigationBarRect: bottomNavigationBarRect,
snackBarRect, bottomSheetRect: bottomSheetRect,
snackBarRect: snackBarRect,
); );
}); });
testWidgets('miniStartFloat', (WidgetTester tester) async { testWidgets('miniStartFloat', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(12.0, 506.0, 60.0, 554.0); const Rect defaultRect = Rect.fromLTRB(12.0, 506.0, 60.0, 554.0);
// Positioned relative to BottomNavigationBar
const Rect bottomNavigationBarRect = Rect.fromLTRB(12.0, 441.0, 60.0, 489.0);
// Positioned relative to BottomSheet // Positioned relative to BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(12.0, 480.0, 60.0, 528.0); const Rect bottomSheetRect = Rect.fromLTRB(12.0, 480.0, 60.0, 528.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -829,15 +957,18 @@ void main() {
await _runFloatTests( await _runFloatTests(
tester, tester,
FloatingActionButtonLocation.miniStartFloat, FloatingActionButtonLocation.miniStartFloat,
defaultRect, defaultRect: defaultRect,
bottomSheetRect, bottomNavigationBarRect: bottomNavigationBarRect,
snackBarRect, bottomSheetRect: bottomSheetRect,
snackBarRect: snackBarRect,
mini: true, mini: true,
); );
}); });
testWidgets('centerFloat', (WidgetTester tester) async { testWidgets('centerFloat', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(372.0, 494.0, 428.0, 550.0); const Rect defaultRect = Rect.fromLTRB(372.0, 494.0, 428.0, 550.0);
// Positioned relative to BottomNavigationBar
const Rect bottomNavigationBarRect = Rect.fromLTRB(372.0, 429.0, 428.0, 485.0);
// Positioned relative to BottomSheet // Positioned relative to BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(372.0, 472.0, 428.0, 528.0); const Rect bottomSheetRect = Rect.fromLTRB(372.0, 472.0, 428.0, 528.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -845,14 +976,17 @@ void main() {
await _runFloatTests( await _runFloatTests(
tester, tester,
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
defaultRect, defaultRect: defaultRect,
bottomSheetRect, bottomNavigationBarRect: bottomNavigationBarRect,
snackBarRect, bottomSheetRect: bottomSheetRect,
snackBarRect: snackBarRect,
); );
}); });
testWidgets('miniCenterFloat', (WidgetTester tester) async { testWidgets('miniCenterFloat', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(376.0, 506.0, 424.0, 554.0); const Rect defaultRect = Rect.fromLTRB(376.0, 506.0, 424.0, 554.0);
// Positioned relative to BottomNavigationBar
const Rect bottomNavigationBarRect = Rect.fromLTRB(376.0, 441.0, 424.0, 489.0);
// Positioned relative to BottomSheet // Positioned relative to BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(376.0, 480.0, 424.0, 528.0); const Rect bottomSheetRect = Rect.fromLTRB(376.0, 480.0, 424.0, 528.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -860,15 +994,18 @@ void main() {
await _runFloatTests( await _runFloatTests(
tester, tester,
FloatingActionButtonLocation.miniCenterFloat, FloatingActionButtonLocation.miniCenterFloat,
defaultRect, defaultRect: defaultRect,
bottomSheetRect, bottomNavigationBarRect: bottomNavigationBarRect,
snackBarRect, bottomSheetRect: bottomSheetRect,
snackBarRect: snackBarRect,
mini: true, mini: true,
); );
}); });
testWidgets('endFloat', (WidgetTester tester) async { testWidgets('endFloat', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(728.0, 494.0, 784.0, 550.0); const Rect defaultRect = Rect.fromLTRB(728.0, 494.0, 784.0, 550.0);
// Positioned relative to BottomNavigationBar
const Rect bottomNavigationBarRect = Rect.fromLTRB(728.0, 429.0, 784.0, 485.0);
// Positioned relative to BottomSheet // Positioned relative to BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(728.0, 472.0, 784.0, 528.0); const Rect bottomSheetRect = Rect.fromLTRB(728.0, 472.0, 784.0, 528.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -876,14 +1013,17 @@ void main() {
await _runFloatTests( await _runFloatTests(
tester, tester,
FloatingActionButtonLocation.endFloat, FloatingActionButtonLocation.endFloat,
defaultRect, defaultRect: defaultRect,
bottomSheetRect, bottomNavigationBarRect: bottomNavigationBarRect,
snackBarRect, bottomSheetRect: bottomSheetRect,
snackBarRect: snackBarRect,
); );
}); });
testWidgets('miniEndFloat', (WidgetTester tester) async { testWidgets('miniEndFloat', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(740.0, 506.0, 788.0, 554.0); const Rect defaultRect = Rect.fromLTRB(740.0, 506.0, 788.0, 554.0);
// Positioned relative to BottomNavigationBar
const Rect bottomNavigationBarRect = Rect.fromLTRB(740.0, 441.0, 788.0, 489.0);
// Positioned relative to BottomSheet // Positioned relative to BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(740.0, 480.0, 788.0, 528.0); const Rect bottomSheetRect = Rect.fromLTRB(740.0, 480.0, 788.0, 528.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -891,9 +1031,10 @@ void main() {
await _runFloatTests( await _runFloatTests(
tester, tester,
FloatingActionButtonLocation.miniEndFloat, FloatingActionButtonLocation.miniEndFloat,
defaultRect, defaultRect: defaultRect,
bottomSheetRect, bottomNavigationBarRect: bottomNavigationBarRect,
snackBarRect, bottomSheetRect: bottomSheetRect,
snackBarRect: snackBarRect,
mini: true, mini: true,
); );
}); });
@ -908,11 +1049,11 @@ void main() {
// - with SnackBar // - with SnackBar
Future<void> _runDockedTests( Future<void> _runDockedTests(
WidgetTester tester, WidgetTester tester,
FloatingActionButtonLocation location, FloatingActionButtonLocation location, {
Rect defaultRect, Rect defaultRect,
Rect bottomNavigationBarRect, Rect bottomNavigationBarRect,
Rect bottomSheetRect, Rect bottomSheetRect,
Rect snackBarRect, { Rect snackBarRect,
bool mini = false, bool mini = false,
}) async { }) async {
const double keyboardHeight = 200.0; const double keyboardHeight = 200.0;
@ -1130,7 +1271,7 @@ void main() {
testWidgets('startDocked', (WidgetTester tester) async { testWidgets('startDocked', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(16.0, 494.0, 72.0, 550.0); const Rect defaultRect = Rect.fromLTRB(16.0, 494.0, 72.0, 550.0);
// Positioned relative to BottomNavigationBar // Positioned relative to BottomNavigationBar
const Rect bottomNavRect = Rect.fromLTRB(16.0, 473.0, 72.0, 529.0); const Rect bottomNavigationBarRect = Rect.fromLTRB(16.0, 473.0, 72.0, 529.0);
// Positioned relative to BottomNavigationBar & BottomSheet // Positioned relative to BottomNavigationBar & BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(16.0, 373.0, 72.0, 429.0); const Rect bottomSheetRect = Rect.fromLTRB(16.0, 373.0, 72.0, 429.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -1138,17 +1279,17 @@ void main() {
await _runDockedTests( await _runDockedTests(
tester, tester,
FloatingActionButtonLocation.startDocked, FloatingActionButtonLocation.startDocked,
defaultRect, defaultRect: defaultRect,
bottomNavRect, bottomNavigationBarRect: bottomNavigationBarRect,
bottomSheetRect, bottomSheetRect: bottomSheetRect,
snackBarRect, snackBarRect: snackBarRect,
); );
}); });
testWidgets('miniStartDocked', (WidgetTester tester) async { testWidgets('miniStartDocked', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(12.0, 502.0, 60.0, 550.0); const Rect defaultRect = Rect.fromLTRB(12.0, 502.0, 60.0, 550.0);
// Positioned relative to BottomNavigationBar // Positioned relative to BottomNavigationBar
const Rect bottomNavRect = Rect.fromLTRB(12.0, 477.0, 60.0, 525.0); const Rect bottomNavigationBarRect = Rect.fromLTRB(12.0, 477.0, 60.0, 525.0);
// Positioned relative to BottomNavigationBar & BottomSheet // Positioned relative to BottomNavigationBar & BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(12.0, 377.0, 60.0, 425.0); const Rect bottomSheetRect = Rect.fromLTRB(12.0, 377.0, 60.0, 425.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -1156,10 +1297,10 @@ void main() {
await _runDockedTests( await _runDockedTests(
tester, tester,
FloatingActionButtonLocation.miniStartDocked, FloatingActionButtonLocation.miniStartDocked,
defaultRect, defaultRect: defaultRect,
bottomNavRect, bottomNavigationBarRect: bottomNavigationBarRect,
bottomSheetRect, bottomSheetRect: bottomSheetRect,
snackBarRect, snackBarRect: snackBarRect,
mini: true, mini: true,
); );
}); });
@ -1167,7 +1308,7 @@ void main() {
testWidgets('centerDocked', (WidgetTester tester) async { testWidgets('centerDocked', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(372.0, 494.0, 428.0, 550.0); const Rect defaultRect = Rect.fromLTRB(372.0, 494.0, 428.0, 550.0);
// Positioned relative to BottomNavigationBar // Positioned relative to BottomNavigationBar
const Rect bottomNavRect = Rect.fromLTRB(372.0, 473.0, 428.0, 529.0); const Rect bottomNavigationBarRect = Rect.fromLTRB(372.0, 473.0, 428.0, 529.0);
// Positioned relative to BottomNavigationBar & BottomSheet // Positioned relative to BottomNavigationBar & BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(372.0, 373.0, 428.0, 429.0); const Rect bottomSheetRect = Rect.fromLTRB(372.0, 373.0, 428.0, 429.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -1175,17 +1316,17 @@ void main() {
await _runDockedTests( await _runDockedTests(
tester, tester,
FloatingActionButtonLocation.centerDocked, FloatingActionButtonLocation.centerDocked,
defaultRect, defaultRect: defaultRect,
bottomNavRect, bottomNavigationBarRect: bottomNavigationBarRect,
bottomSheetRect, bottomSheetRect: bottomSheetRect,
snackBarRect, snackBarRect: snackBarRect,
); );
}); });
testWidgets('miniCenterDocked', (WidgetTester tester) async { testWidgets('miniCenterDocked', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(376.0, 502.0, 424.0, 550.0); const Rect defaultRect = Rect.fromLTRB(376.0, 502.0, 424.0, 550.0);
// Positioned relative to BottomNavigationBar // Positioned relative to BottomNavigationBar
const Rect bottomNavRect = Rect.fromLTRB(376.0, 477.0, 424.0, 525.0); const Rect bottomNavigationBarRect = Rect.fromLTRB(376.0, 477.0, 424.0, 525.0);
// Positioned relative to BottomNavigationBar & BottomSheet // Positioned relative to BottomNavigationBar & BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(376.0, 377.0, 424.0, 425.0); const Rect bottomSheetRect = Rect.fromLTRB(376.0, 377.0, 424.0, 425.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -1193,10 +1334,10 @@ void main() {
await _runDockedTests( await _runDockedTests(
tester, tester,
FloatingActionButtonLocation.miniCenterDocked, FloatingActionButtonLocation.miniCenterDocked,
defaultRect, defaultRect: defaultRect,
bottomNavRect, bottomNavigationBarRect: bottomNavigationBarRect,
bottomSheetRect, bottomSheetRect: bottomSheetRect,
snackBarRect, snackBarRect: snackBarRect,
mini: true, mini: true,
); );
}); });
@ -1204,7 +1345,7 @@ void main() {
testWidgets('endDocked', (WidgetTester tester) async { testWidgets('endDocked', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(728.0, 494.0, 784.0, 550.0); const Rect defaultRect = Rect.fromLTRB(728.0, 494.0, 784.0, 550.0);
// Positioned relative to BottomNavigationBar // Positioned relative to BottomNavigationBar
const Rect bottomNavRect = Rect.fromLTRB(728.0, 473.0, 784.0, 529.0); const Rect bottomNavigationBarRect = Rect.fromLTRB(728.0, 473.0, 784.0, 529.0);
// Positioned relative to BottomNavigationBar & BottomSheet // Positioned relative to BottomNavigationBar & BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(728.0, 373.0, 784.0, 429.0); const Rect bottomSheetRect = Rect.fromLTRB(728.0, 373.0, 784.0, 429.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -1212,17 +1353,17 @@ void main() {
await _runDockedTests( await _runDockedTests(
tester, tester,
FloatingActionButtonLocation.endDocked, FloatingActionButtonLocation.endDocked,
defaultRect, defaultRect: defaultRect,
bottomNavRect, bottomNavigationBarRect: bottomNavigationBarRect,
bottomSheetRect, bottomSheetRect: bottomSheetRect,
snackBarRect, snackBarRect: snackBarRect,
); );
}); });
testWidgets('miniEndDocked', (WidgetTester tester) async { testWidgets('miniEndDocked', (WidgetTester tester) async {
const Rect defaultRect = Rect.fromLTRB(740.0, 502.0, 788.0, 550.0); const Rect defaultRect = Rect.fromLTRB(740.0, 502.0, 788.0, 550.0);
// Positioned relative to BottomNavigationBar // Positioned relative to BottomNavigationBar
const Rect bottomNavRect = Rect.fromLTRB(740.0, 477.0, 788.0, 525.0); const Rect bottomNavigationBarRect = Rect.fromLTRB(740.0, 477.0, 788.0, 525.0);
// Positioned relative to BottomNavigationBar & BottomSheet // Positioned relative to BottomNavigationBar & BottomSheet
const Rect bottomSheetRect = Rect.fromLTRB(740.0, 377.0, 788.0, 425.0); const Rect bottomSheetRect = Rect.fromLTRB(740.0, 377.0, 788.0, 425.0);
// Positioned relative to SnackBar // Positioned relative to SnackBar
@ -1230,10 +1371,10 @@ void main() {
await _runDockedTests( await _runDockedTests(
tester, tester,
FloatingActionButtonLocation.miniEndDocked, FloatingActionButtonLocation.miniEndDocked,
defaultRect, defaultRect: defaultRect,
bottomNavRect, bottomNavigationBarRect: bottomNavigationBarRect,
bottomSheetRect, bottomSheetRect: bottomSheetRect,
snackBarRect, snackBarRect: snackBarRect,
mini: true, mini: true,
); );
}); });
@ -1243,9 +1384,9 @@ void main() {
// - with an AppBar // - with an AppBar
Future<void> _runTopTests( Future<void> _runTopTests(
WidgetTester tester, WidgetTester tester,
FloatingActionButtonLocation location, FloatingActionButtonLocation location, {
Rect defaultRect, Rect defaultRect,
Rect appBarRect, { Rect appBarRect,
bool mini = false, bool mini = false,
}) async { }) async {
const double viewPadding = 50.0; const double viewPadding = 50.0;
@ -1283,8 +1424,8 @@ void main() {
await _runTopTests( await _runTopTests(
tester, tester,
FloatingActionButtonLocation.startTop, FloatingActionButtonLocation.startTop,
defaultRect, defaultRect: defaultRect,
appBarRect, appBarRect: appBarRect,
); );
}); });
@ -1295,8 +1436,8 @@ void main() {
await _runTopTests( await _runTopTests(
tester, tester,
FloatingActionButtonLocation.miniStartTop, FloatingActionButtonLocation.miniStartTop,
defaultRect, defaultRect: defaultRect,
appBarRect, appBarRect: appBarRect,
mini: true, mini: true,
); );
}); });
@ -1308,8 +1449,8 @@ void main() {
await _runTopTests( await _runTopTests(
tester, tester,
FloatingActionButtonLocation.centerTop, FloatingActionButtonLocation.centerTop,
defaultRect, defaultRect: defaultRect,
appBarRect, appBarRect: appBarRect,
); );
}); });
@ -1320,8 +1461,8 @@ void main() {
await _runTopTests( await _runTopTests(
tester, tester,
FloatingActionButtonLocation.miniCenterTop, FloatingActionButtonLocation.miniCenterTop,
defaultRect, defaultRect: defaultRect,
appBarRect, appBarRect: appBarRect,
mini: true, mini: true,
); );
}); });
@ -1333,8 +1474,8 @@ void main() {
await _runTopTests( await _runTopTests(
tester, tester,
FloatingActionButtonLocation.endTop, FloatingActionButtonLocation.endTop,
defaultRect, defaultRect: defaultRect,
appBarRect, appBarRect: appBarRect,
); );
}); });
@ -1345,8 +1486,8 @@ void main() {
await _runTopTests( await _runTopTests(
tester, tester,
FloatingActionButtonLocation.miniEndTop, FloatingActionButtonLocation.miniEndTop,
defaultRect, defaultRect: defaultRect,
appBarRect, appBarRect: appBarRect,
mini: true, mini: true,
); );
}); });