Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Revert "Fix BottomNavigationBar label style text colors" #102756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2022
Merged

Revert "Fix BottomNavigationBar label style text colors" #102756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions packages/flutter/lib/src/material/bottom_navigation_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class BottomNavigationBar extends StatefulWidget {
///
/// If [selectedLabelStyle].color and [unselectedLabelStyle].color values
/// are non-null, they will be used instead of [selectedItemColor] and
/// [unselectedItemColor] to style the label color.
/// [unselectedItemColor].
///
/// If custom [IconThemeData]s are used, you must provide both
/// [selectedIconTheme] and [unselectedIconTheme], and both
Expand Down Expand Up @@ -384,7 +384,7 @@ class _BottomNavigationTile extends StatelessWidget {
this.animation,
this.iconSize, {
this.onTap,
this.itemColorTween,
this.colorTween,
this.flex,
this.selected = false,
required this.selectedLabelStyle,
Expand All @@ -410,7 +410,7 @@ class _BottomNavigationTile extends StatelessWidget {
final Animation<double> animation;
final double iconSize;
final VoidCallback? onTap;
final ColorTween? itemColorTween;
final ColorTween? colorTween;
final double? flex;
final bool selected;
final IconThemeData? selectedIconTheme;
Expand Down Expand Up @@ -513,7 +513,7 @@ class _BottomNavigationTile extends StatelessWidget {
child: _Tile(
layout: layout,
icon: _TileIcon(
itemColorTween: itemColorTween!,
colorTween: colorTween!,
animation: animation,
iconSize: iconSize,
selected: selected,
Expand All @@ -522,7 +522,7 @@ class _BottomNavigationTile extends StatelessWidget {
unselectedIconTheme: unselectedIconTheme,
),
label: _Label(
itemColorTween: itemColorTween!,
colorTween: colorTween!,
animation: animation,
item: item,
selectedLabelStyle: selectedLabelStyle,
Expand Down Expand Up @@ -602,7 +602,7 @@ class _Tile extends StatelessWidget {

class _TileIcon extends StatelessWidget {
const _TileIcon({
required this.itemColorTween,
required this.colorTween,
required this.animation,
required this.iconSize,
required this.selected,
Expand All @@ -612,7 +612,7 @@ class _TileIcon extends StatelessWidget {
}) : assert(selected != null),
assert(item != null);

final ColorTween itemColorTween;
final ColorTween colorTween;
final Animation<double> animation;
final double iconSize;
final bool selected;
Expand All @@ -622,7 +622,7 @@ class _TileIcon extends StatelessWidget {

@override
Widget build(BuildContext context) {
final Color? iconColor = itemColorTween.evaluate(animation);
final Color? iconColor = colorTween.evaluate(animation);
final IconThemeData defaultIconTheme = IconThemeData(
color: iconColor,
size: iconSize,
Expand All @@ -646,22 +646,22 @@ class _TileIcon extends StatelessWidget {

class _Label extends StatelessWidget {
const _Label({
required this.itemColorTween,
required this.colorTween,
required this.animation,
required this.item,
required this.selectedLabelStyle,
required this.unselectedLabelStyle,
required this.showSelectedLabels,
required this.showUnselectedLabels,
}) : assert(itemColorTween != null),
}) : assert(colorTween != null),
assert(animation != null),
assert(item != null),
assert(selectedLabelStyle != null),
assert(unselectedLabelStyle != null),
assert(showSelectedLabels != null),
assert(showUnselectedLabels != null);

final ColorTween itemColorTween;
final ColorTween colorTween;
final Animation<double> animation;
final BottomNavigationBarItem item;
final TextStyle selectedLabelStyle;
Expand All @@ -679,16 +679,10 @@ class _Label extends StatelessWidget {
selectedLabelStyle,
animation.value,
)!;
final ColorTween labelColor = ColorTween(
begin: unselectedLabelStyle.color
?? itemColorTween.begin,
end: selectedLabelStyle.color
?? itemColorTween.end,
);
Widget text = DefaultTextStyle.merge(
style: customStyle.copyWith(
fontSize: selectedFontSize,
color: labelColor.evaluate(animation),
color: colorTween.evaluate(animation),
),
// The font size should grow here when active, but because of the way
// font rendering works, it doesn't grow smoothly if we just animate
Expand Down Expand Up @@ -929,10 +923,10 @@ class _BottomNavigationBarState extends State<BottomNavigationBar> with TickerPr
break;
}

final ColorTween itemColorTween;
final ColorTween colorTween;
switch (_effectiveType) {
case BottomNavigationBarType.fixed:
itemColorTween = ColorTween(
colorTween = ColorTween(
begin: widget.unselectedItemColor
?? bottomTheme.unselectedItemColor
?? themeData.unselectedWidgetColor,
Expand All @@ -943,7 +937,7 @@ class _BottomNavigationBarState extends State<BottomNavigationBar> with TickerPr
);
break;
case BottomNavigationBarType.shifting:
itemColorTween = ColorTween(
colorTween = ColorTween(
begin: widget.unselectedItemColor
?? bottomTheme.unselectedItemColor
?? themeData.colorScheme.surface,
Expand Down Expand Up @@ -977,7 +971,7 @@ class _BottomNavigationBarState extends State<BottomNavigationBar> with TickerPr
onTap: () {
widget.onTap?.call(i);
},
itemColorTween: itemColorTween,
colorTween: colorTween,
flex: _evaluateFlex(_animations[i]),
selected: i == widget.currentIndex,
showSelectedLabels: widget.showSelectedLabels ?? bottomTheme.showSelectedLabels ?? true,
Expand Down
8 changes: 2 additions & 6 deletions packages/flutter/test/material/bottom_navigation_bar_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,8 @@ void main() {
});

testWidgets('Custom selected and unselected font styles', (WidgetTester tester) async {
const Color selectedTextColor = Color(0xff00ff00);
const Color unselectedTextColor = Color(0xff0000ff);
const TextStyle selectedTextStyle = TextStyle(color: selectedTextColor, fontWeight: FontWeight.w200, fontSize: 18.0);
const TextStyle unselectedTextStyle = TextStyle(color: unselectedTextColor, fontWeight: FontWeight.w600, fontSize: 12.0);
const TextStyle selectedTextStyle = TextStyle(fontWeight: FontWeight.w200, fontSize: 18.0);
const TextStyle unselectedTextStyle = TextStyle(fontWeight: FontWeight.w600, fontSize: 12.0);

await tester.pumpWidget(
MaterialApp(
Expand All @@ -169,10 +167,8 @@ void main() {

final TextStyle selectedFontStyle = tester.renderObject<RenderParagraph>(find.text('AC')).text.style!;
final TextStyle unselectedFontStyle = tester.renderObject<RenderParagraph>(find.text('Alarm')).text.style!;
expect(selectedFontStyle.color, equals(selectedTextColor));
expect(selectedFontStyle.fontSize, equals(selectedTextStyle.fontSize));
expect(selectedFontStyle.fontWeight, equals(selectedTextStyle.fontWeight));
expect(unselectedFontStyle.color, equals(unselectedTextColor));
expect(
tester.firstWidget<Transform>(find.ancestor(of: find.text('Alarm'), matching: find.byType(Transform))).transform,
equals(Matrix4.diagonal3(Vector3.all(unselectedTextStyle.fontSize! / selectedTextStyle.fontSize!))),
Expand Down