Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
9608a64d
Unverified
Commit
9608a64d
authored
Oct 16, 2021
by
Kate Lovett
Committed by
GitHub
Oct 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Remove BottomNavigationBarItem.title deprecation" (#91930)
parent
99c8dd56
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
90 additions
and
71 deletions
+90
-71
bottom_tab_bar.dart
packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
+1
-0
bottom_navigation_bar.dart
packages/flutter/lib/src/material/bottom_navigation_bar.dart
+5
-4
bottom_navigation_bar_theme.dart
...flutter/lib/src/material/bottom_navigation_bar_theme.dart
+2
-2
bottom_navigation_bar_item.dart
...s/flutter/lib/src/widgets/bottom_navigation_bar_item.dart
+15
-0
bottom_tab_bar_test.dart
packages/flutter/test/cupertino/bottom_tab_bar_test.dart
+1
-1
bottom_navigation_bar_test.dart
...ges/flutter/test/material/bottom_navigation_bar_test.dart
+66
-64
No files found.
packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
View file @
9608a64d
...
@@ -254,6 +254,7 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget {
...
@@ -254,6 +254,7 @@ 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 @
9608a64d
...
@@ -185,8 +185,9 @@ class BottomNavigationBar extends StatefulWidget {
...
@@ -185,8 +185,9 @@ 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 label'
,
'Every item must have a non-null
title or
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
),
...
@@ -246,13 +247,13 @@ class BottomNavigationBar extends StatefulWidget {
...
@@ -246,13 +247,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.
label
].
/// [BottomNavigationBarItem.
title
].
///
///
/// 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.
label
]s.
/// [BottomNavigationBarItem.
title
]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
;
...
@@ -691,7 +692,7 @@ class _Label extends StatelessWidget {
...
@@ -691,7 +692,7 @@ class _Label extends StatelessWidget {
),
),
),
),
alignment:
Alignment
.
bottomCenter
,
alignment:
Alignment
.
bottomCenter
,
child:
Text
(
item
.
label
!),
child:
item
.
title
??
Text
(
item
.
label
!),
),
),
);
);
...
...
packages/flutter/lib/src/material/bottom_navigation_bar_theme.dart
View file @
9608a64d
...
@@ -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.
label
].
/// [BottomNavigationBarItem.
title
].
///
///
/// 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.
label
]s.
/// [BottomNavigationBarItem.
title
]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 @
9608a64d
...
@@ -24,11 +24,17 @@ class BottomNavigationBarItem {
...
@@ -24,11 +24,17 @@ 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.
...
@@ -61,6 +67,15 @@ class BottomNavigationBarItem {
...
@@ -61,6 +67,15 @@ 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 @
9608a64d
...
@@ -429,7 +429,7 @@ Future<void> main() async {
...
@@ -429,7 +429,7 @@ Future<void> main() async {
semantics
.
dispose
();
semantics
.
dispose
();
});
});
testWidgets
(
'
Label
of items should be nullable'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'
Title
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 @
9608a64d
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment