Skip to content

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

Reland Remove BottomNavigationBarItem.title deprecation (#92197)

parent 34dbee66
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 90 deletions
packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
View file @ 0a2227c2
...@@ -254,7 +254,6 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget { ...@@ -254,7 +254,6 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget {
Expanded( Expanded(
child: Center(child: active ? item.activeIcon : item.icon), child: Center(child: active ? item.activeIcon : item.icon),
), ),
if (item.title != null) item.title!,
if (item.label != null) Text(item.label!), if (item.label != null) Text(item.label!),
]; ];
} }
......
packages/flutter/lib/src/material/bottom_navigation_bar.dart
View file @ 0a2227c2
...@@ -185,9 +185,8 @@ class BottomNavigationBar extends StatefulWidget { ...@@ -185,9 +185,8 @@ class BottomNavigationBar extends StatefulWidget {
}) : assert(items != null), }) : assert(items != null),
assert(items.length >= 2), assert(items.length >= 2),
assert( assert(
items.every((BottomNavigationBarItem item) => item.title != null) ||
items.every((BottomNavigationBarItem item) => item.label != null), items.every((BottomNavigationBarItem item) => item.label != null),
'Every item must have a non-null title or label', 'Every item must have a non-null label',
), ),
assert(0 <= currentIndex && currentIndex < items.length), assert(0 <= currentIndex && currentIndex < items.length),
assert(elevation == null || elevation >= 0.0), assert(elevation == null || elevation >= 0.0),
...@@ -247,13 +246,13 @@ class BottomNavigationBar extends StatefulWidget { ...@@ -247,13 +246,13 @@ class BottomNavigationBar extends StatefulWidget {
final double iconSize; final double iconSize;
/// The color of the selected [BottomNavigationBarItem.icon] and /// The color of the selected [BottomNavigationBarItem.icon] and
/// [BottomNavigationBarItem.title]. /// [BottomNavigationBarItem.label].
/// ///
/// If null then the [ThemeData.primaryColor] is used. /// If null then the [ThemeData.primaryColor] is used.
final Color? selectedItemColor; final Color? selectedItemColor;
/// The color of the unselected [BottomNavigationBarItem.icon] and /// The color of the unselected [BottomNavigationBarItem.icon] and
/// [BottomNavigationBarItem.title]s. /// [BottomNavigationBarItem.label]s.
/// ///
/// If null then the [ThemeData.unselectedWidgetColor]'s color is used. /// If null then the [ThemeData.unselectedWidgetColor]'s color is used.
final Color? unselectedItemColor; final Color? unselectedItemColor;
...@@ -692,7 +691,7 @@ class _Label extends StatelessWidget { ...@@ -692,7 +691,7 @@ class _Label extends StatelessWidget {
), ),
), ),
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: item.title ?? Text(item.label!), child: Text(item.label!),
), ),
); );
......
packages/flutter/lib/src/material/bottom_navigation_bar_theme.dart
View file @ 0a2227c2
...@@ -78,13 +78,13 @@ class BottomNavigationBarThemeData with Diagnosticable { ...@@ -78,13 +78,13 @@ class BottomNavigationBarThemeData with Diagnosticable {
final IconThemeData? unselectedIconTheme; final IconThemeData? unselectedIconTheme;
/// The color of the selected [BottomNavigationBarItem.icon] and /// The color of the selected [BottomNavigationBarItem.icon] and
/// [BottomNavigationBarItem.title]. /// [BottomNavigationBarItem.label].
/// ///
/// See [BottomNavigationBar.selectedItemColor]. /// See [BottomNavigationBar.selectedItemColor].
final Color? selectedItemColor; final Color? selectedItemColor;
/// The color of the unselected [BottomNavigationBarItem.icon] and /// The color of the unselected [BottomNavigationBarItem.icon] and
/// [BottomNavigationBarItem.title]s. /// [BottomNavigationBarItem.label]s.
/// ///
/// See [BottomNavigationBar.unselectedItemColor]. /// See [BottomNavigationBar.unselectedItemColor].
final Color? unselectedItemColor; final Color? unselectedItemColor;
......
packages/flutter/lib/src/widgets/bottom_navigation_bar_item.dart
View file @ 0a2227c2
...@@ -24,17 +24,11 @@ class BottomNavigationBarItem { ...@@ -24,17 +24,11 @@ class BottomNavigationBarItem {
/// The argument [icon] should not be null and the argument [label] should not be null when used in a Material Design's [BottomNavigationBar]. /// The argument [icon] should not be null and the argument [label] should not be null when used in a Material Design's [BottomNavigationBar].
const BottomNavigationBarItem({ const BottomNavigationBarItem({
required this.icon, required this.icon,
@Deprecated(
'Use "label" instead, as it allows for an improved text-scaling experience. '
'This feature was deprecated after v1.19.0.',
)
this.title,
this.label, this.label,
Widget? activeIcon, Widget? activeIcon,
this.backgroundColor, this.backgroundColor,
this.tooltip, this.tooltip,
}) : activeIcon = activeIcon ?? icon, }) : activeIcon = activeIcon ?? icon,
assert(label == null || title == null),
assert(icon != null); assert(icon != null);
/// The icon of the item. /// The icon of the item.
...@@ -67,15 +61,6 @@ class BottomNavigationBarItem { ...@@ -67,15 +61,6 @@ class BottomNavigationBarItem {
/// * [BottomNavigationBarItem.icon], for a description of how to pair icons. /// * [BottomNavigationBarItem.icon], for a description of how to pair icons.
final Widget activeIcon; final Widget activeIcon;
/// The title of the item. If the title is not provided only the icon will be shown when not used in a Material Design [BottomNavigationBar].
///
/// This field is deprecated, use [label] instead.
@Deprecated(
'Use "label" instead, as it allows for an improved text-scaling experience. '
'This feature was deprecated after v1.19.0.',
)
final Widget? title;
/// The text label for this [BottomNavigationBarItem]. /// The text label for this [BottomNavigationBarItem].
/// ///
/// This will be used to create a [Text] widget to put in the bottom navigation bar. /// This will be used to create a [Text] widget to put in the bottom navigation bar.
......
packages/flutter/test/cupertino/bottom_tab_bar_test.dart
View file @ 0a2227c2
...@@ -429,7 +429,7 @@ Future<void> main() async { ...@@ -429,7 +429,7 @@ Future<void> main() async {
semantics.dispose(); semantics.dispose();
}); });
testWidgets('Title of items should be nullable', (WidgetTester tester) async { testWidgets('Label of items should be nullable', (WidgetTester tester) async {
final MemoryImage iconProvider = MemoryImage(Uint8List.fromList(kTransparentImage)); final MemoryImage iconProvider = MemoryImage(Uint8List.fromList(kTransparentImage));
final List<int> itemsTapped = <int>[]; final List<int> itemsTapped = <int>[];
......
packages/flutter/test/material/bottom_navigation_bar_test.dart
View file @ 0a2227c2
...@@ -28,11 +28,11 @@ void main() { ...@@ -28,11 +28,11 @@ void main() {
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.ac_unit), icon: Icon(Icons.ac_unit),
title: Text('AC'), label: 'AC',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.access_alarm), icon: Icon(Icons.access_alarm),
title: Text('Alarm'), label: 'Alarm',
), ),
], ],
onTap: (int index) { onTap: (int index) {
...@@ -1031,11 +1031,11 @@ void main() { ...@@ -1031,11 +1031,11 @@ void main() {
bottomNavigationBar: BottomNavigationBar( bottomNavigationBar: BottomNavigationBar(
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
title: Text('A'), label: 'A',
icon: Icon(Icons.ac_unit), icon: Icon(Icons.ac_unit),
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
title: Text('B'), label: 'B',
icon: Icon(Icons.battery_alert), icon: Icon(Icons.battery_alert),
), ),
], ],
...@@ -1046,7 +1046,7 @@ void main() { ...@@ -1046,7 +1046,7 @@ void main() {
); );
final RenderBox box = tester.renderObject(find.byType(BottomNavigationBar)); final RenderBox box = tester.renderObject(find.byType(BottomNavigationBar));
expect(box.size.height, equals(66.0)); expect(box.size.height, equals(56.0));
}); });
testWidgets('BottomNavigationBar does not grow with textScaleFactor when labels are provided', (WidgetTester tester) async { testWidgets('BottomNavigationBar does not grow with textScaleFactor when labels are provided', (WidgetTester tester) async {
...@@ -1216,9 +1216,9 @@ void main() { ...@@ -1216,9 +1216,9 @@ void main() {
expect(find.byTooltip('C'), findsNothing); expect(find.byTooltip('C'), findsNothing);
}); });
testWidgets('BottomNavigationBar limits width of tiles with long titles', (WidgetTester tester) async { testWidgets('BottomNavigationBar limits width of tiles with long labels', (WidgetTester tester) async {
final Text longTextA = Text(''.padLeft(100, 'A')); final String longTextA = List<String>.generate(100, (int index) => 'A').toString();
final Text longTextB = Text(''.padLeft(100, 'B')); final String longTextB = List<String>.generate(100, (int index) => 'B').toString();
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
...@@ -1226,11 +1226,11 @@ void main() { ...@@ -1226,11 +1226,11 @@ void main() {
bottomNavigationBar: BottomNavigationBar( bottomNavigationBar: BottomNavigationBar(
items: <BottomNavigationBarItem>[ items: <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
title: longTextA, label: longTextA,
icon: const Icon(Icons.ac_unit), icon: const Icon(Icons.ac_unit),
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
title: longTextB, label: longTextB,
icon: const Icon(Icons.battery_alert), icon: const Icon(Icons.battery_alert),
), ),
], ],
...@@ -1242,9 +1242,9 @@ void main() { ...@@ -1242,9 +1242,9 @@ void main() {
final RenderBox box = tester.renderObject(find.byType(BottomNavigationBar)); final RenderBox box = tester.renderObject(find.byType(BottomNavigationBar));
expect(box.size.height, equals(kBottomNavigationBarHeight)); expect(box.size.height, equals(kBottomNavigationBarHeight));
final RenderBox itemBoxA = tester.renderObject(find.text(longTextA.data!)); final RenderBox itemBoxA = tester.renderObject(find.text(longTextA));
expect(itemBoxA.size, equals(const Size(400.0, 14.0))); expect(itemBoxA.size, equals(const Size(400.0, 14.0)));
final RenderBox itemBoxB = tester.renderObject(find.text(longTextB.data!)); final RenderBox itemBoxB = tester.renderObject(find.text(longTextB));
expect(itemBoxB.size, equals(const Size(400.0, 14.0))); expect(itemBoxB.size, equals(const Size(400.0, 14.0)));
}); });
...@@ -1379,15 +1379,15 @@ void main() { ...@@ -1379,15 +1379,15 @@ void main() {
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.ac_unit), icon: Icon(Icons.ac_unit),
title: Text('AC'), label: 'AC',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.access_alarm), icon: Icon(Icons.access_alarm),
title: Text('Alarm'), label: 'Alarm',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.hot_tub), icon: Icon(Icons.hot_tub),
title: Text('Hot Tub'), label: 'Hot Tub',
), ),
], ],
), ),
...@@ -1433,15 +1433,15 @@ void main() { ...@@ -1433,15 +1433,15 @@ void main() {
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.ac_unit), icon: Icon(Icons.ac_unit),
title: Text('AC'), label: 'AC',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.access_alarm), icon: Icon(Icons.access_alarm),
title: Text('Alarm'), label: 'Alarm',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.hot_tub), icon: Icon(Icons.hot_tub),
title: Text('Hot Tub'), label: 'Hot Tub',
), ),
], ],
), ),
...@@ -1626,7 +1626,7 @@ void main() { ...@@ -1626,7 +1626,7 @@ void main() {
} }
}); });
testWidgets('BottomNavigationBar item title should not be nullable', (WidgetTester tester) async { testWidgets('BottomNavigationBar item label should not be nullable', (WidgetTester tester) async {
expect(() { expect(() {
MaterialApp( MaterialApp(
home: Scaffold( home: Scaffold(
...@@ -1732,11 +1732,11 @@ void main() { ...@@ -1732,11 +1732,11 @@ void main() {
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.ac_unit), icon: Icon(Icons.ac_unit),
title: Text('Red'), label: 'Red',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.access_alarm), icon: Icon(Icons.access_alarm),
title: Text('Green'), label: 'Green',
), ),
], ],
), ),
...@@ -1775,11 +1775,11 @@ void main() { ...@@ -1775,11 +1775,11 @@ void main() {
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.ac_unit), icon: Icon(Icons.ac_unit),
title: Text('Red'), label: 'Red',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.access_alarm), icon: Icon(Icons.access_alarm),
title: Text('Green'), label: 'Green',
), ),
], ],
), ),
...@@ -1817,8 +1817,8 @@ void main() { ...@@ -1817,8 +1817,8 @@ void main() {
child: BottomNavigationBar( child: BottomNavigationBar(
mouseCursor: SystemMouseCursors.text, mouseCursor: SystemMouseCursors.text,
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(icon: Icon(Icons.ac_unit), title: Text('AC')), BottomNavigationBarItem(icon: Icon(Icons.ac_unit), label: 'AC'),
BottomNavigationBarItem(icon: Icon(Icons.access_alarm), title: Text('Alarm')), BottomNavigationBarItem(icon: Icon(Icons.access_alarm), label: 'Alarm'),
], ],
), ),
), ),
...@@ -1842,8 +1842,8 @@ void main() { ...@@ -1842,8 +1842,8 @@ void main() {
cursor: SystemMouseCursors.forbidden, cursor: SystemMouseCursors.forbidden,
child: BottomNavigationBar( child: BottomNavigationBar(
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(icon: Icon(Icons.ac_unit), title: Text('AC')), BottomNavigationBarItem(icon: Icon(Icons.ac_unit), label: 'AC'),
BottomNavigationBarItem(icon: Icon(Icons.access_alarm), title: Text('Alarm')), BottomNavigationBarItem(icon: Icon(Icons.access_alarm), label: 'Alarm'),
], ],
), ),
), ),
...@@ -1875,8 +1875,8 @@ void main() { ...@@ -1875,8 +1875,8 @@ void main() {
child: BottomNavigationBar( child: BottomNavigationBar(
enableFeedback: enableFeedback, enableFeedback: enableFeedback,
items: const <BottomNavigationBarItem>[ items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(icon: Icon(Icons.ac_unit), title: Text('AC')), BottomNavigationBarItem(icon: Icon(Icons.ac_unit), label: 'AC'),
BottomNavigationBarItem(icon: Icon(Icons.access_alarm), title: Text('Alarm')), BottomNavigationBarItem(icon: Icon(Icons.access_alarm), label: 'Alarm'),
], ],
), ),
), ),
...@@ -2015,9 +2015,7 @@ void main() { ...@@ -2015,9 +2015,7 @@ void main() {
testWidgets('BottomNavigationBar default layout', (WidgetTester tester) async { testWidgets('BottomNavigationBar default layout', (WidgetTester tester) async {
final Key icon0 = UniqueKey(); final Key icon0 = UniqueKey();
final Key title0 = UniqueKey();
final Key icon1 = UniqueKey(); final Key icon1 = UniqueKey();
final Key title1 = UniqueKey();
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
...@@ -2028,11 +2026,11 @@ void main() { ...@@ -2028,11 +2026,11 @@ void main() {
items: <BottomNavigationBarItem>[ items: <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SizedBox(key: icon0, width: 200, height: 10), icon: SizedBox(key: icon0, width: 200, height: 10),
title: SizedBox(key: title0, width: 200, height: 10), label: 'Title0',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SizedBox(key: icon1, width: 200, height: 10), icon: SizedBox(key: icon1, width: 200, height: 10),
title: SizedBox(key: title1, width: 200, height: 10), label: 'Title1',
), ),
], ],
), ),
...@@ -2047,25 +2045,24 @@ void main() { ...@@ -2047,25 +2045,24 @@ void main() {
// The height of the navigation bar is kBottomNavigationBarHeight = 56 // The height of the navigation bar is kBottomNavigationBarHeight = 56
// The top of the navigation bar is 600 - 56 = 544 // The top of the navigation bar is 600 - 56 = 544
// The top and bottom of the selected item is defined by its centered icon/label column: // The top and bottom of the selected item is defined by its centered icon/label column:
// top = 544 - (56 - (10 + 10)) / 2 = 562 // top = 544 + ((56 - (10 + 10)) / 2) = 562
// bottom = top + 10 + 10 = 582 // bottom = top + 10 + 10 = 582
expect(tester.getRect(find.byKey(icon0)).top, 562); expect(tester.getRect(find.byKey(icon0)).top, 560.0);
expect(tester.getRect(find.byKey(title0)).bottom, 582); expect(tester.getRect(find.text('Title0')).bottom, 584.0);
// The items are horizontal padded according to // The items are padded horizontally according to
// MainAxisAlignment.spaceBetween Left/right padding is 800 - (200 // MainAxisAlignment.spaceAround. Left/right padding is:
// * 4) / 4 = 100. The layout of the unselected item's title is // 800 - (200 * 2) / 4 = 100
// slightly different; not checking that here. // The layout of the unselected item's label is slightly different; not
expect(tester.getRect(find.byKey(title0)), const Rect.fromLTRB(100, 572, 300, 582)); // checking that here.
expect(tester.getRect(find.byKey(icon0)), const Rect.fromLTRB(100, 562, 300, 572)); expect(tester.getRect(find.text('Title0')), const Rect.fromLTRB(158.0, 570.0, 242.0, 584.0));
expect(tester.getRect(find.byKey(icon1)), const Rect.fromLTRB(500, 562, 700, 572)); expect(tester.getRect(find.byKey(icon0)), const Rect.fromLTRB(100.0, 560.0, 300.0, 570.0));
expect(tester.getRect(find.byKey(icon1)), const Rect.fromLTRB(500.0, 560.0, 700.0, 570.0));
}); });
testWidgets('BottomNavigationBar centered landscape layout', (WidgetTester tester) async { testWidgets('BottomNavigationBar centered landscape layout', (WidgetTester tester) async {
final Key icon0 = UniqueKey(); final Key icon0 = UniqueKey();
final Key title0 = UniqueKey();
final Key icon1 = UniqueKey(); final Key icon1 = UniqueKey();
final Key title1 = UniqueKey();
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
...@@ -2077,11 +2074,11 @@ void main() { ...@@ -2077,11 +2074,11 @@ void main() {
items: <BottomNavigationBarItem>[ items: <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SizedBox(key: icon0, width: 200, height: 10), icon: SizedBox(key: icon0, width: 200, height: 10),
title: SizedBox(key: title0, width: 200, height: 10), label: 'Title0',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SizedBox(key: icon1, width: 200, height: 10), icon: SizedBox(key: icon1, width: 200, height: 10),
title: SizedBox(key: title1, width: 200, height: 10), label: 'Title1',
), ),
], ],
), ),
...@@ -2094,22 +2091,23 @@ void main() { ...@@ -2094,22 +2091,23 @@ void main() {
expect(tester.getSize(find.byType(BottomNavigationBar)), const Size(800, kBottomNavigationBarHeight)); expect(tester.getSize(find.byType(BottomNavigationBar)), const Size(800, kBottomNavigationBarHeight));
expect(tester.getRect(find.byType(BottomNavigationBar)), const Rect.fromLTRB(0, 600 - kBottomNavigationBarHeight, 800, 600)); expect(tester.getRect(find.byType(BottomNavigationBar)), const Rect.fromLTRB(0, 600 - kBottomNavigationBarHeight, 800, 600));
// The items are laid out as in the default case, within width=600 // The items are laid out as in the default case, within width = 600
// (the "portrait" width) and the result is centered with the // (the "portrait" width) and the result is centered with the
// landscape width=800. So item 0's left edges are (800 - 600) / 2 + // landscape width = 800.
// (600 - 400) / 4 = 150. Item 1's right edge is 800 - 150 = // So item 0's left edges are:
// 650. The layout of the unselected item's title is slightly // ((800 - 600) / 2) + ((600 - 400) / 4) = 150.
// different; not checking that here. // Item 1's right edge is:
expect(tester.getRect(find.byKey(title0)), const Rect.fromLTRB(150.0, 572.0, 350.0, 582.0)); // 800 - 150 = 650
expect(tester.getRect(find.byKey(icon0)), const Rect.fromLTRB(150, 562, 350, 572)); // The layout of the unselected item's label is slightly different; not
expect(tester.getRect(find.byKey(icon1)), const Rect.fromLTRB(450, 562, 650, 572)); // checking that here.
expect(tester.getRect(find.text('Title0')), const Rect.fromLTRB(208.0, 570.0, 292.0, 584.0));
expect(tester.getRect(find.byKey(icon0)), const Rect.fromLTRB(150.0, 560.0, 350.0, 570.0));
expect(tester.getRect(find.byKey(icon1)), const Rect.fromLTRB(450.0, 560.0, 650.0, 570.0));
}); });
testWidgets('BottomNavigationBar linear landscape layout', (WidgetTester tester) async { testWidgets('BottomNavigationBar linear landscape layout', (WidgetTester tester) async {
final Key icon0 = UniqueKey(); final Key icon0 = UniqueKey();
final Key title0 = UniqueKey();
final Key icon1 = UniqueKey(); final Key icon1 = UniqueKey();
final Key title1 = UniqueKey();
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
...@@ -2121,11 +2119,11 @@ void main() { ...@@ -2121,11 +2119,11 @@ void main() {
items: <BottomNavigationBarItem>[ items: <BottomNavigationBarItem>[
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SizedBox(key: icon0, width: 100, height: 20), icon: SizedBox(key: icon0, width: 100, height: 20),
title: SizedBox(key: title0, width: 100, height: 20), label: 'Title0',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: SizedBox(key: icon1, width: 100, height: 20), icon: SizedBox(key: icon1, width: 100, height: 20),
title: SizedBox(key: title1, width: 100, height: 20), label: 'Title1',
), ),
], ],
), ),
...@@ -2139,12 +2137,12 @@ void main() { ...@@ -2139,12 +2137,12 @@ void main() {
expect(tester.getRect(find.byType(BottomNavigationBar)), const Rect.fromLTRB(0, 600 - kBottomNavigationBarHeight, 800, 600)); expect(tester.getRect(find.byType(BottomNavigationBar)), const Rect.fromLTRB(0, 600 - kBottomNavigationBarHeight, 800, 600));
// The items are laid out as in the default case except each // The items are laid out as in the default case except each
// item's icon/title is arranged in a row, with 8 pixels in // item's icon/label is arranged in a row, with 8 pixels in
// between the icon and title. The layout of the unselected // between the icon and label. The layout of the unselected
// item's title is slightly different; not checking that here. // item's label is slightly different; not checking that here.
expect(tester.getRect(find.byKey(title0)), const Rect.fromLTRB(204, 562, 304, 582)); expect(tester.getRect(find.text('Title0')), const Rect.fromLTRB(212.0, 565.0, 296.0, 579.0));
expect(tester.getRect(find.byKey(icon0)), const Rect.fromLTRB(96, 562, 196, 582)); expect(tester.getRect(find.byKey(icon0)), const Rect.fromLTRB(104.0, 562.0, 204.0, 582.0));
expect(tester.getRect(find.byKey(icon1)), const Rect.fromLTRB(496, 562, 596, 582)); expect(tester.getRect(find.byKey(icon1)), const Rect.fromLTRB(504.0, 562.0, 604.0, 582.0));
}); });
} }
......
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